]> Creatis software - gdcm.git/commitdiff
ENH: Trying to get shared lib to work on win32
authormalaterre <malaterre>
Mon, 30 May 2005 02:45:41 +0000 (02:45 +0000)
committermalaterre <malaterre>
Mon, 30 May 2005 02:45:41 +0000 (02:45 +0000)
src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in

index 54324011325e2c3150281c4c34fe7a83213526fe..2db4468176efbf6388b4b47428bb9b2d6206e5fa 100644 (file)
@@ -175,6 +175,14 @@ IF(GDCM_SIZEOF___INT64)
   ENDIF(NOT GDCM_TYPE_SAME_LONG_AND___INT64)
 ENDIF(GDCM_SIZEOF___INT64)
 
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DJASPERDLL)
+  ELSE (BUILD_SHARED_LIBS)
+    SET(JASPERSTATIC 1)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+
 CONFIGURE_FILE(
   "${GDCMJASPER_SOURCE_DIR}/src/libjasper/include/jasper/jas_config.h.in"
   "${GDCMJASPER_BINARY_DIR}/src/libjasper/include/jasper/jas_config.h"
index afabada9e06679f7a9630684aa78a4d00919945c..3063cf6d4e79e7b27bc4521853f7d4c05146a8b9 100644 (file)
@@ -217,6 +217,16 @@ typedef __int64            longlong;
 /* #define  ssize_t    int */
 #endif // HAVE_SYS_TYPES_H
 
+#if defined(_WIN32) && !defined(JASPERSTATIC)
+#ifdef JASPERDLL
+#define EXTERN(type)            __declspec(dllexport) type
+#else
+#define EXTERN(type)            __declspec(dllimport) type
+#endif
+#else
+#define EXTERN(type)            extern type
+#endif
+
 
 #endif