[panotools-cvs] /hgroot/panotools/libpano: Fixes compilation with MinGW compiler

[<pan...@li...>]

branch:     
details:    http://panotools.hg.sourceforge.net/hgweb/panotools/panotools/hgroot/panotools/libpano/rev/c251644f9866
changeset:  773:c251644f9866
user:       tmodes
date:       Sun Mar 03 08:30:58 2013 +0100
description:

Fixes compilation with MinGW compiler

diffstat:

 CMakeLists.txt     |   8 ++++++++
 ColourBrightness.c |   5 +++--
 sys_compat_win.c   |  12 +++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs (78 lines):

diff -r 489ef38b776c -r c251644f9866 CMakeLists.txt
--- a/CMakeLists.txt	Sat Mar 02 13:18:41 2013 +0100
+++ b/CMakeLists.txt	Sun Mar 03 08:30:58 2013 +0100
@@ -161,6 +161,11 @@
 		)
 	ENDIF(NOT BUILD_DLL)
   ENDIF(MSVC)
+  IF(MINGW)
+    IF(NOT BUILD_WINGUI)
+      ADD_DEFINITIONS(/D__Ansi__)
+    ENDIF()
+  ENDIF(MINGW)
 ENDIF(UNIX)
 
 ##
@@ -266,6 +271,9 @@
     add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src})
     target_link_libraries(pano13 ${_common_libs})
     set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2")
+    IF(MINGW)
+      set_target_properties(pano13 PROPERTIES PREFIX "")
+    ENDIF()
     install(TARGETS pano13 RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
   ELSE(BUILD_DLL)
     #create and install static library
diff -r 489ef38b776c -r c251644f9866 ColourBrightness.c
--- a/ColourBrightness.c	Sat Mar 02 13:18:41 2013 +0100
+++ b/ColourBrightness.c	Sun Mar 03 08:30:58 2013 +0100
@@ -38,12 +38,13 @@
 
 #include "pttiff.h"
 
-
+#ifdef WIN32
 #ifdef _MSC_VER
 
 // MSVC doesn't support round()
 //#define round(x) ( (int) (x+0.5) )
 #define round(x) (int)(x)
+#endif // _MSC_VER
 
 // MSVC wants htons() to be a library function
 // here we define it as a macro instead
@@ -68,7 +69,7 @@
 #error "Either BIG_ENDIAN or LITTLE_ENDIAN must be #defined, but not both."
 #endif
 
-#endif  //def _MSC_VER
+#endif  //def WIN32
 
 
 
diff -r 489ef38b776c -r c251644f9866 sys_compat_win.c
--- a/sys_compat_win.c	Sat Mar 02 13:18:41 2013 +0100
+++ b/sys_compat_win.c	Sun Mar 03 08:30:58 2013 +0100
@@ -52,7 +52,7 @@
     return name;
 }
 
-
+#ifdef _MSC_VER
 int panoTimeToStrWithTimeZone(char *sTime, int len, struct tm  *time) 
 {
     char sZone[20];
@@ -70,3 +70,13 @@
     }  else 
         return 0;
 }
+#else
+#ifdef __MINGW32__
+int panoTimeToStrWithTimeZone(char *sTime, int len, struct tm  *time) 
+{
+    assert(len >= 11);
+    return strftime(sTime, len, "%H%M%S%z", time);
+
+}
+#endif
+#endif