Changeset 364 for trunk/thirds

Timestamp:

Sep 29, 2012, 3:59:06 PM (12 years ago)

Author:

djay

Message:

Update to make ZOO-Kernel able to compile and run from Windows Platforms. A special thanks to Espen Messel, Knut Landmark and Benrd Härtwig for providing many patches that I can successfully apply on the SVN source tree and to Farkas for continuing requesting for ZOO-Kernel to run on Windows platforms privately and through the ZOO-Discuss mailing list.

Location:

trunk/thirds

Files:

• cgic206/cgic.c (modified) (1 diff)
• cgic206/makefile.vc (modified) (1 diff)
• include/unistd.h (modified) (1 diff)

trunk/thirds/cgic206/cgic.c

@@ -145 +145 @@
         cgiGetenv(&cgiQueryString, "QUERY_STRING");
         cgiSid=NULL;
-        if(strcmp(cgiQueryString,"")==0 && argc>=2){
+        if(cgiQueryString!=NULL && argc>=2){
                 cgiQueryString=argv[1];
                 if(argc>2){

trunk/thirds/cgic206/makefile.vc

@@ -1 @@
-GEODIR=C:/OSGeo4W
-DESTDIR=C:\OSGeo4W
+GEODIR=\MMBK\SRCS\fcgi-2.4.1-SNAP-0311112127\ 
+DESTDIR=..
 CFLAGS=-g -Wall
 CC=cl /TP
-LIBS=$(GEODIR)/lib/libfcgi.lib /nologo
+LIBS=$(GEODIR)/libfcgi/Release/libfcgi.lib /nologo
 LIBS1=./libcgic.lib
 
-CFLAGS=/EHa /nologo /DCRT_SECURE_NO_WARNING /MT /W2 /O2 /D "WIN32" \
-        -I $(GEODIR)/include 
+CFLAGS=/EHa /nologo /DCRT_SECURE_NO_WARNING /MD /W2 /O2 /D "WIN32" \
+        -I $(GEODIR)\include 
 
 all: libcgic.lib #cgictest.exe capture.exe 

trunk/thirds/include/unistd.h

@@ -3 +3 @@
 #include <io.h>
 #include <process.h>
+#define mode_t int
+#define strtok_r strtok_s
+#define S_IRWXU _S_IREAD|_S_IWRITE
+#define S_IRGRP _S_IREAD|_S_IWRITE
+#define S_IROTH _S_IREAD|_S_IWRITE
+#define S_IXGRP _S_IREAD|_S_IWRITE
+#define S_IXOTH _S_IREAD|_S_IWRITE
+#define S_IWOTH _S_IREAD|_S_IWRITE
+#define S_IRUSR _S_IREAD
+#define S_IXGRP _S_IREAD|_S_IWRITE
+#define S_IWGRP _S_IREAD|_S_IWRITE
+#define S_IWUSR _S_IREAD|_S_IWRITE
 
 #endif