COMP: Fix static lib on win32, plus add a comment about conformance

diff --git a/src/gdcmopenjpeg/CMakeLists.txt b/src/gdcmopenjpeg/CMakeLists.txt
index 5a0d2b3edb46f640b0378c613e6285269f270b44..2c96d486700541f01f240062f8ef759608776afa 100644 (file)
--- a/src/gdcmopenjpeg/CMakeLists.txt
+++ b/src/gdcmopenjpeg/CMakeLists.txt
@@ -14,3 +14,6 @@ SUBDIRS(
     libopenjpeg
     #codec
     )
+
+# TODO, technically we should not have to ...
+# http://www.crc.ricoh.com/~gormish/jpeg2000conformance/

diff --git a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
index 43d01117810a91f8231de85aa40fa4466477412a..22d64a6daa07360e4b2dcd671e21d81a4d5769a2 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
+++ b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
@@ -19,9 +19,21 @@ SET(openjpeg_SRCS
   jpt.c
   jp2.c
 )
+
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPENJPEGDLL)
+    #SET(JPEGDLL 1)
+  ELSE (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPENJPEGSTATIC)
+    #SET(JPEGSTATIC 1)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+
+
 ADD_LIBRARY(gdcmopenjpeg ${openjpeg_SRCS})
 
-## $Id: CMakeLists.txt,v 1.3 2005/10/24 15:58:35 malaterre Exp $
+## $Id: CMakeLists.txt,v 1.4 2005/10/24 20:53:32 malaterre Exp $
 ##
 ## makefile for OpenJPEG library
 #

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.h b/src/gdcmopenjpeg/libopenjpeg/j2k.h
index 7c31d207f80f6b3991ac1dbd61f8ba6e8ddfd4b0..17e13d1a2a3bf23f35c989ec10297371ad567841 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/j2k.h
+++ b/src/gdcmopenjpeg/libopenjpeg/j2k.h
@@ -28,7 +28,7 @@
 
 #define VERSION "0.0.8"
 
-#ifdef _WIN32 /*DAVID_WIN32*/
+#if defined(_WIN32) && defined (OPENJPEGDLL)
 #ifdef gdcmopenjpeg_EXPORTS /*LIBJ2K_EXPORTS*/
 #define LIBJ2K_API __declspec(dllexport)
 #else
@@ -38,6 +38,12 @@
 #define LIBJ2K_API
 #endif
 
+#if defined(_WIN32) && defined (OPENJPEGSTATIC)
+#define LIBJ2K_API __declspec(dllexport)
+#else
+#define LIBJ2K_API extern
+#endif
+
 #ifndef __J2K_H
 #define __J2K_H