Changeset 978 for trunk

Timestamp:

Dec 30, 2020, 4:13:12 PM (4 years ago)

Author:

djay

Message:

Add missing files and small fix for windows support

Location:

trunk/zoo-project

Files:

• zoo-api/java/makefile.vc (added)
• zoo-services/gdal/profile/service.c (modified) (1 diff)
• zoo-services/utils/registry/makefile.vc (modified) (1 diff)

trunk/zoo-project/zoo-services/gdal/profile/service.c

@@ -35 +35 @@
 #include "cpl_conv.h"
 #include "ogr_api.h"
-#if GDAL_VERSION_MAJOR >= 2
+#if !defined(WIN32) && GDAL_VERSION_MAJOR >= 2
 #include <gdal_priv.h>
 #endif

trunk/zoo-project/zoo-services/utils/registry/makefile.vc

@@ -14 +14 @@
 !ENDIF
 !IFDEF MS_DIR
-FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
+FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE) $(ZOOK_DIR)/caching.obj $(ZOOK_DIR)/ulinet.obj
 !ENDIF
 
 cgi-env/wps_registry.zo: service.c
         $(CPP) /D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DZOO_SERVICE $(CFLAGS) /c service.c
-        link /dll /out:cgi-env/wps_registry.zo $(FILES) ./service.obj $(LDFLAGS) /FORCE:MULTIPLE
+        link /dll /out:cgi-env/wps_registry.zo $(FILES) ./service.obj $(ZOOK_DIR)/service_json.obj $(JSONC_LIB) $(LDFLAGS) /FORCE:MULTIPLE
 
 clean: