Changeset 217 for branches/branch-1.2/zoo-services/arithmetics

Timestamp:

May 31, 2011, 3:30:49 AM (14 years ago)

Author:

djay

Message:

Merge trunk r111:r216 into branch-1.2

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-services/arithmetics/cgi-env/Multiply.zcfg (modified) (1 diff)
• zoo-services/arithmetics/makefile.vc (modified) (1 diff)
• zoo-services/arithmetics/test_service.c (modified) (1 diff)

branches/branch-1.2/zoo-services/arithmetics/cgi-env/Multiply.zcfg

@@ -5 +5 @@
  storeSupported = true
  statusSupported = true
- serviceProvider = demo_service.zo
+ serviceProvider = test_service.zo
  serviceType = C
  <MetaData>

branches/branch-1.2/zoo-services/arithmetics/makefile.vc

@@ -1 +1 @@
 GEODIR=c:/OSGeo4W/
 TOOLS=c:/Users/djay/GeoLabs/tools/
-CFLAGS=-I$(GEODIR)/include -I$(TOOLS)/include -I../../../zoo-kernel/ -I./ -DLINUX_FREE_ISSUE -DDEBUG
+CFLAGS=-I$(GEODIR)/include -I$(TOOLS)/include -I../../zoo-kernel/ -I./ -DLINUX_FREE_ISSUE -DDEBUG -DWIN32
 CPP=cl /TP 
 
-cgi-env/service.zo: service.c
-        $(CPP) $(CFLAGS) /c service.c
-        link /dll /out:cgi-env/ogr_service.zso ../../../zoo-kernel/service_internal.obj ./service.obj -L$(TOOLS)/lib/libssl32.dll.a $(GEODIR)/lib/libxml2.lib $(GEODIR)/lib/gdal_i.lib $(TOOLS)/lib/libeay32.dll.a $(TOOLS)/lib/libcrypto.a $(TOOLS)/lib/libssl32.dll.a 
+cgi-env/test_service.zo: test_service.c
+        $(CPP) $(CFLAGS) /c test_service.c
+        link /dll /out:cgi-env/test_service.zo ../../zoo-kernel/service_internal.obj ./test_service.obj -L$(TOOLS)/lib/libssl32.dll.a $(GEODIR)/lib/libxml2.lib $(GEODIR)/lib/gdal_i.lib $(TOOLS)/lib/libeay32.dll.a $(TOOLS)/lib/libcrypto.a $(TOOLS)/lib/libssl32.dll.a $(TOOLS)/lib/libintl.lib
 
 clean:
-        rm -f cgi-env/ogr_service.zso
+        erase cgi-env\demo_service.*

branches/branch-1.2/zoo-services/arithmetics/test_service.c

@@ -3 +3 @@
 extern "C" {
 
+#ifdef WIN32
+__declspec(dllexport)
+#endif
   int Multiply(maps*& conf,maps*& inputs,maps*& outputs){
         fprintf(stderr,"\nService internal print\n");