walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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.
This commit is contained in:
Luis Ibanez 2010-09-08 22:40:11 +00:00
parent b7208fb525
commit 531c0cf26f
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
codec/CMakeLists.txt
View File

@ -14,6 +14,12 @@ IF(DONT_HAVE_GETOPT)
) )
ENDIF(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: # Headers file are located here:
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/libopenjpeg

1
codec/convert.c
View File

@ -39,7 +39,6 @@
#include <tiffio.h> #include <tiffio.h>
#include <png.h> #include <png.h>
#endif /* WIN32 */ #endif /* WIN32 */
#include "openjpegConfigure.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "convert.h" #include "convert.h"

1
codec/image_to_j2k.c
View File

@ -34,7 +34,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "openjpegConfigure.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "compat/getopt.h" #include "compat/getopt.h"
#include "convert.h" #include "convert.h"

1
codec/j2k_dump.c
View File

@ -29,7 +29,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "openjpegConfigure.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "j2k.h" #include "j2k.h"
#include "jp2.h" #include "jp2.h"

1
codec/j2k_to_image.c
View File

@ -34,7 +34,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "openjpegConfigure.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "compat/getopt.h" #include "compat/getopt.h"
#include "convert.h" #include "convert.h"