comparison Resources/CMake/DcmtkConfiguration.cmake @ 3599:e01900f913e7

fix duplicate symbol "jaritab" in wasm
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 07 Jan 2020 10:53:32 +0100
parents e1904cfdca2c
children d737173197e1
comparison
equal deleted inserted replaced
3598:f2df51bff2fd 3599:e01900f913e7
46 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16 46 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg16
47 ${DCMTK_SOURCES_DIR}/dcmimgle/include 47 ${DCMTK_SOURCES_DIR}/dcmimgle/include
48 ) 48 )
49 list(REMOVE_ITEM DCMTK_SOURCES 49 list(REMOVE_ITEM DCMTK_SOURCES
50 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc 50 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/ddpiimpl.cc
51
52 # Solves linking problem in WebAssembly: "wasm-ld: error:
53 # duplicate symbol: jaritab" (modification in Orthanc 1.5.9)
54 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg8/jaricom.c
55 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg12/jaricom.c
56 ${DCMTK_SOURCES_DIR}/dcmjpeg/libijg24/jaricom.c
51 57
52 # Disable support for encoding JPEG (modification in Orthanc 1.0.1) 58 # Disable support for encoding JPEG (modification in Orthanc 1.0.1)
53 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc 59 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djcodece.cc
54 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc 60 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencsv1.cc
55 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc 61 ${DCMTK_SOURCES_DIR}/dcmjpeg/libsrc/djencbas.cc