From: malaterre <malaterre>
Date: Mon, 30 May 2005 02:45:41 +0000 (+0000)
Subject: ENH: Trying to get shared lib to work on win32
X-Git-Tag: Version1.2.bp~645
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3abb6c11e8de2088367ed37676e5748e05084242;p=gdcm.git

ENH: Trying to get shared lib to work on win32
---

diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
index 54324011..2db44681 100644
--- a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
+++ b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt
@@ -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"
diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
index afabada9..3063cf6d 100644
--- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
+++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in
@@ -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