ENH: getting toward win32 support

diff --git a/src/gdcmjpegls/Decoder/CMakeLists.txt b/src/gdcmjpegls/Decoder/CMakeLists.txt
index 6a78b5725c31f09e4ba98f3eda8408fdc31f76e2..8f7809153c5c45d107885898e858473049daa112 100644 (file)
--- a/src/gdcmjpegls/Decoder/CMakeLists.txt
+++ b/src/gdcmjpegls/Decoder/CMakeLists.txt
@@ -1,5 +1,13 @@
 INCLUDE_REGULAR_EXPRESSION("^.*$")
 
+CHECK_INCLUDE_FILE("unistd.h"    HAVE_UNISTD_H)
+CONFIGURE_FILE(
+  "${GDCMJPEGLS_SOURCE_DIR}/Decoder/jpegls_config.h.in"
+  "${GDCMJPEGLS_BINARY_DIR}/Decoder/jpegls_config.h"
+  @ONLY IMMEDIATE)
+
+INCLUDE_DIRECTORIES("${GDCMJPEGLS_BINARY_DIR}/Decoder")
+
 SET(GDCMJPEGLS_SRCS
   global.c 
   jpegmark.c 

diff --git a/src/gdcmjpegls/Decoder/global.c b/src/gdcmjpegls/Decoder/global.c
index 55d1ddc7e9034ea865940fe29768bcbfe289c1e7..533e065925512978dcb21480eb8bf54d8ffe83de 100644 (file)
--- a/src/gdcmjpegls/Decoder/global.c
+++ b/src/gdcmjpegls/Decoder/global.c
@@ -51,8 +51,12 @@
  */
 
 #include <time.h>
-#include <unistd.h>
 #include "global.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#else
+#include <io.h>
+#endif
 
 
 

diff --git a/src/gdcmjpegls/Decoder/global.h b/src/gdcmjpegls/Decoder/global.h
index 9277ea5469c08947aa42bfee2625116f755c0ebd..e7412bd05b2c59233fd10da17eda001d6d396f71 100644 (file)
--- a/src/gdcmjpegls/Decoder/global.h
+++ b/src/gdcmjpegls/Decoder/global.h
@@ -52,6 +52,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include "jpegls_config.h"
 
 #ifndef GLOBAL_H
 #define GLOBAL_H

diff --git a/src/gdcmjpegls/Decoder/jpegls_config.h.in b/src/gdcmjpegls/Decoder/jpegls_config.h.in
new file mode 100644 (file)
index 0000000..159256d
--- /dev/null
+++ b/src/gdcmjpegls/Decoder/jpegls_config.h.in
@@ -0,0 +1,30 @@
+/* Avoid problems due to multiple inclusion. */
+#ifndef JPEGPLS_CONFIG_H
+#define JPEGPLS_CONFIG_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#cmakedefine HAVE_UNISTD_H
+
+#cmakedefine JPEGLSSTATIC
+
+/* a function referenced thru EXTERNs: */
+#if defined( _WIN32 ) && defined (JPEGLSDLL)
+#define GLOBAL(type)            __declspec(dllexport) type
+#else
+#define GLOBAL(type)            type
+#endif
+
+/* a reference to a GLOBAL function: */
+#if defined(_WIN32) && !defined(JPEGLSSTATIC)
+#ifdef JPEGLSDLL
+#define EXTERN(type)            __declspec(dllexport) type
+#else
+#define EXTERN(type)            __declspec(dllimport) type
+#endif
+#else
+#define EXTERN(type)            extern type
+#endif
+
+
+#endif
+