diff options
| author | Luis Ibanez <luis.ibanez@gmail.com> | 2010-09-08 22:40:11 +0000 |
|---|---|---|
| committer | Luis Ibanez <luis.ibanez@gmail.com> | 2010-09-08 22:40:11 +0000 |
| commit | 531c0cf26f0c327b42a5caa79725e4afeb98768d (patch) | |
| tree | b40bf58e7894092dfc922081eeaec2fe7fa487cf /codec | |
| parent | b7208fb525f0f260bdd1d095d2e7ef3692b0d1a0 (diff) | |
Reverting the use of #include "openjpegConfigure.h" until we find a compatible
way of doing this with autoconf, and with the default VS project files.
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | codec/convert.c | 1 | ||||
| -rw-r--r-- | codec/image_to_j2k.c | 1 | ||||
| -rw-r--r-- | codec/j2k_dump.c | 1 | ||||
| -rw-r--r-- | codec/j2k_to_image.c | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt index fdefce6c..563ae6dd 100644 --- a/codec/CMakeLists.txt +++ b/codec/CMakeLists.txt @@ -14,6 +14,12 @@ IF(DONT_HAVE_GETOPT) ) ENDIF(DONT_HAVE_GETOPT) +# Do the proper thing when building static...if only there was configured +# headers or def files instead +IF(NOT BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-DOPJ_STATIC) +ENDIF(NOT BUILD_SHARED_LIBS) + # Headers file are located here: INCLUDE_DIRECTORIES( ${OPENJPEG_SOURCE_DIR}/libopenjpeg diff --git a/codec/convert.c b/codec/convert.c index a6bf0f73..63707a09 100644 --- a/codec/convert.c +++ b/codec/convert.c @@ -39,7 +39,6 @@ #include <tiffio.h> #include <png.h> #endif /* WIN32 */ -#include "openjpegConfigure.h" #include "openjpeg.h" #include "convert.h" diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c index b5c6ee5d..7acaed07 100644 --- a/codec/image_to_j2k.c +++ b/codec/image_to_j2k.c @@ -34,7 +34,6 @@ #include <stdlib.h> #include <math.h> -#include "openjpegConfigure.h" #include "openjpeg.h" #include "compat/getopt.h" #include "convert.h" diff --git a/codec/j2k_dump.c b/codec/j2k_dump.c index 33465f10..5042f47a 100644 --- a/codec/j2k_dump.c +++ b/codec/j2k_dump.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "openjpegConfigure.h" #include "openjpeg.h" #include "j2k.h" #include "jp2.h" diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c index ef50e031..3b1915c7 100644 --- a/codec/j2k_to_image.c +++ b/codec/j2k_to_image.c @@ -34,7 +34,6 @@ #include <stdlib.h> #include <math.h> -#include "openjpegConfigure.h" #include "openjpeg.h" #include "compat/getopt.h" #include "convert.h" |