diff --git a/jpwl/CMakeLists.txt b/jpwl/CMakeLists.txt index 7063229b..404ad27b 100755 --- a/jpwl/CMakeLists.txt +++ b/jpwl/CMakeLists.txt @@ -2,24 +2,24 @@ ADD_DEFINITIONS(-DUSE_JPWL) -SET(OPJ_SRCS -../libopenjpeg/bio.c -../libopenjpeg/cio.c -../libopenjpeg/dwt.c -../libopenjpeg/event.c -../libopenjpeg/image.c -../libopenjpeg/j2k.c -../libopenjpeg/j2k_lib.c -../libopenjpeg/jp2.c -../libopenjpeg/jpt.c -../libopenjpeg/mct.c -../libopenjpeg/mqc.c -../libopenjpeg/openjpeg.c -../libopenjpeg/pi.c -../libopenjpeg/raw.c -../libopenjpeg/t1.c -../libopenjpeg/t2.c -../libopenjpeg/tcd.c +SET(OPJ_SRCS +../libopenjpeg/bio.c +../libopenjpeg/cio.c +../libopenjpeg/dwt.c +../libopenjpeg/event.c +../libopenjpeg/image.c +../libopenjpeg/j2k.c +../libopenjpeg/j2k_lib.c +../libopenjpeg/jp2.c +../libopenjpeg/jpt.c +../libopenjpeg/mct.c +../libopenjpeg/mqc.c +../libopenjpeg/openjpeg.c +../libopenjpeg/pi.c +../libopenjpeg/raw.c +../libopenjpeg/t1.c +../libopenjpeg/t2.c +../libopenjpeg/tcd.c ../libopenjpeg/tgt.c ) SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c) @@ -50,11 +50,11 @@ INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} ) ADD_EXECUTABLE(JPWL_j2k_to_image -../codec/convert.c -../codec/index.c +../codec/convert.c +../codec/index.c ../codec/j2k_to_image.c ) -TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPJ_PREFIX}openjpeg_JPWL ${TIFF_LIBRARIES}) +TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPJ_PREFIX}openjpeg_JPWL ${TIFF_LIBRARIES} ${PNG_LIBRARIES}) IF(UNIX) TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m) ENDIF(UNIX) @@ -64,7 +64,7 @@ ADD_EXECUTABLE(JPWL_image_to_j2k ../codec/index.c ../codec/image_to_j2k.c ) -TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPJ_PREFIX}openjpeg_JPWL ${TIFF_LIBRARIES}) +TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPJ_PREFIX}openjpeg_JPWL ${TIFF_LIBRARIES} ${PNG_LIBRARIES}) IF(UNIX) TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m) ENDIF(UNIX)