diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-25 08:15:41 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-25 08:15:41 +0000 |
| commit | 4585b23552aa2bbd06ece52cc9920c302b66d3c8 (patch) | |
| tree | b57f74453ee2cf9635246ac47761659113cf83bf /src/lib | |
| parent | 23a624f73adba55d60b1569b2c32c2b0397a4c10 (diff) | |
[trunk] Fix OpenJPWL compilation
Simply move files over from branch 1.5 onto current trunk, and use current openmj2 copy (it contains a copy of openjpeg 1.5.x)
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjpwl/CMakeLists.txt | 41 | ||||
| -rw-r--r-- | src/lib/openmj2/opj_includes.h | 2 |
2 files changed, 21 insertions, 22 deletions
diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt index 39ea7419..616edf58 100644 --- a/src/lib/openjpwl/CMakeLists.txt +++ b/src/lib/openjpwl/CMakeLists.txt @@ -3,25 +3,24 @@ add_definitions(-DUSE_JPWL) set(OPENJPEG_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/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/opj_clock.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 + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/bio.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/cio.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/dwt.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/event.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/image.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/j2k.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/jp2.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/jpt.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/mct.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/mqc.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/openjpeg.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/j2k_lib.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/pi.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/raw.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/t1.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/t2.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/tcd.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2/tgt.c ) set(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c) @@ -34,8 +33,8 @@ endif() include_directories( ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h - ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 - ${OPENJPEG_SOURCE_DIR}/src/lib + ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2 + ${OPENJPEG_SOURCE_DIR}/src/lib/openjpwl ) # Build the library diff --git a/src/lib/openmj2/opj_includes.h b/src/lib/openmj2/opj_includes.h index e5366f5e..e483390c 100644 --- a/src/lib/openmj2/opj_includes.h +++ b/src/lib/openmj2/opj_includes.h @@ -130,7 +130,7 @@ static INLINE long lrintf(float f){ /* JPWL>> */ #ifdef USE_JPWL -#include "./jpwl/jpwl.h" +#include "jpwl.h" #endif /* USE_JPWL */ /* <<JPWL */ |