Changeset 757 for trunk/zoo-project/zoo-kernel

Timestamp:

Apr 20, 2016, 11:51:55 AM (9 years ago)

Author:

djay

Message:

Update the makefiles and small fixe for windows platform.

Location:

trunk/zoo-project/zoo-kernel

Files:

• nmake.opt (modified) (1 diff)
• service.c (modified) (1 diff)
• service.h (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/nmake.opt

@@ -11 +11 @@
 #PHP_LIB=$(PHP_DIR)\Release_TS\php5embed.lib
 
-!IF DEFINED(MS_DIR)
-MS_BASE=$(MS_DIR)
-!INCLUDE $(MS_DIR)\nmake.opt
-!ENDIF
+#!IF DEFINED(MS_DIR)
+#MS_BASE=$(MS_DIR)
+#!INCLUDE $(MS_DIR)\nmake.opt
+#!ENDIF
 
 !IFDEF JS_DIR
-JS_CFLAGS=-DXP_WIN -DUSE_JS -I$(JS_DIR)
+JS_CFLAGS=-DXP_WIN -DUSE_JS -I$(JS_DIR) -I$(JS_DIR)/dist/include
 JS_LDFLAGS=$(JS_DIR)/mozjs185-1.0.lib
 JS_FILE=service_internal_js.obj
 !ENDIF
 
+!IFDEF JS_CFG
+#!INCLUDE $(JS_CFG)
+#JS_CFLAGS=-DXP_WIN -DUSE_JS $(JS_CONFIG_CFLAGS)
+#JS_LDFLAGS=$(JS_CONFIG_LDFLAGS)
+JS_CFLAGS=-DXP_WIN -DUSE_JS -include c:/mozilla-build/msys/local/include/mozjs-24/js/RequiredDefines.h -Ic:/mozilla-build/msys/local/include/mozjs-24 -IC:/mozilla-build/msys/local/include
+JS_LDFLAGS=c:/mozilla-build/msys/local/lib/mozjs-24.lib  kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib psapi.lib 
+JS_FILE=service_internal_js.obj
+!ENDIF
+
 !IFDEF MS_DIR
-MS_CFLAGS=-DUSE_MS -I$(MS_DIR)
-MS_LDFLAGS=$(MS_DIR)/mapserver_i.lib
+MS_CFLAGS=-DUSE_MS -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -I$(MS_DIR)/include
+MS_LDFLAGS=$(MS_DIR)/lib/mapserver_i.lib
 MS_FILE=service_internal_ms.obj
 !ENDIF

trunk/zoo-project/zoo-kernel/service.c

@@ -25 +25 @@
 #include "service.h"
 
-#ifdef _MSC_VER
+
+#if defined(_MSC_VER) && _MSC_VER < 1800
 #include <stdarg.h>
 /**

trunk/zoo-project/zoo-kernel/service.h

@@ -35 +35 @@
 
 #ifdef WIN32
-#ifndef USE_MS
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
-//#else
-//#define snprintf sprintf_s
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
 #endif
 #define zStrdup _strdup
@@ -324 +323 @@
   ZOO_DLL_EXPORT void mapsToCharXXX(maps*,char***);
   ZOO_DLL_EXPORT void charxxxToMaps(char***,maps**);
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1800
   // snprintf for Visual Studio compiler;
   // it is also used by services (e.g., GetStatus), therefore exported to shared library
   ZOO_DLL_EXPORT int snprintf(char *buffer, size_t n, const char *format, ...);
-#endif  
+#endif
 #ifdef __cplusplus
 }