summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-15 08:09:31 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-15 08:09:31 +0000
commit3416c6d91b8f1258b57451936ab11761ec9b37d1 (patch)
tree0c5accc4640fe50563f8aaffa6cbe1c1579ddfdd /src/bin
parent54c2bcb60f6bea769a512fd6117cb8a504bb8bd6 (diff)
[trunk] Fix openmj2 compilation in static mode.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/mj2/CMakeLists.txt27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
index 8279fb84..a8f5ca9f 100644
--- a/src/bin/mj2/CMakeLists.txt
+++ b/src/bin/mj2/CMakeLists.txt
@@ -2,31 +2,6 @@
set(common_SRCS ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c)
-# While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files.
-set(OPJ_SRCS
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/bio.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cio.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/dwt.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/event.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/image.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k_lib.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jp2.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jpt.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mct.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mqc.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/openjpeg.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/pi.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/raw.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t1.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
-${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
-)
-
-#set(MJ2_SRCS mj2.c mj2_convert.c)
-
if(WIN32)
add_definitions(-DOPJ_STATIC)
endif()
@@ -34,7 +9,6 @@ endif()
# Headers file are located here:
include_directories(
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
- #${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/src/lib/openmj2
${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME}
@@ -49,7 +23,6 @@ foreach(exe
add_executable(${exe}
${exe}.c
${common_SRCS}
- ${OPJ_SRCS}
${MJ2_SRCS}
${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
)