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.

diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index fdefce6c42d636f248491c21d825c3e551b7fca4..563ae6dd9c6c6427380632c3a59be110b570d8fe 100644 (file)
--- 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 a6bf0f73ae3b151bf5f5a50d07bde4369f8c7b7e..63707a093c48d9a57f6f3a80c75d1df65a5a15f1 100644 (file)
--- 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 b5c6ee5d609ec7b9440847d7f790b770d27d7ebc..7acaed073cb0d5de93815e05028dd743c433a127 100644 (file)
--- 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 33465f10046855aec8e279f87e5fac375667d106..5042f47a5f20a8c25081c2ae1a1f7d5f6e3615b2 100644 (file)
--- 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 ef50e031b373132c0add2cc56b78a9f0055e2251..3b1915c74547afce9c7ed4f3235eb53d1ec56724 100644 (file)
--- 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"