Changeset 757


Ignore:
Timestamp:
Apr 20, 2016, 11:51:55 AM (5 years ago)
Author:
djay
Message:

Update the makefiles and small fixe for windows platform.

Location:
trunk/zoo-project
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/nmake.opt

    r712 r757  
    1111#PHP_LIB=$(PHP_DIR)\Release_TS\php5embed.lib
    1212
    13 !IF DEFINED(MS_DIR)
    14 MS_BASE=$(MS_DIR)
    15 !INCLUDE $(MS_DIR)\nmake.opt
    16 !ENDIF
     13#!IF DEFINED(MS_DIR)
     14#MS_BASE=$(MS_DIR)
     15#!INCLUDE $(MS_DIR)\nmake.opt
     16#!ENDIF
    1717
    1818!IFDEF JS_DIR
    19 JS_CFLAGS=-DXP_WIN -DUSE_JS -I$(JS_DIR)
     19JS_CFLAGS=-DXP_WIN -DUSE_JS -I$(JS_DIR) -I$(JS_DIR)/dist/include
    2020JS_LDFLAGS=$(JS_DIR)/mozjs185-1.0.lib
    2121JS_FILE=service_internal_js.obj
    2222!ENDIF
    2323
     24!IFDEF JS_CFG
     25#!INCLUDE $(JS_CFG)
     26#JS_CFLAGS=-DXP_WIN -DUSE_JS $(JS_CONFIG_CFLAGS)
     27#JS_LDFLAGS=$(JS_CONFIG_LDFLAGS)
     28JS_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
     29JS_LDFLAGS=c:/mozilla-build/msys/local/lib/mozjs-24.lib  kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib psapi.lib
     30JS_FILE=service_internal_js.obj
     31!ENDIF
     32
    2433!IFDEF MS_DIR
    25 MS_CFLAGS=-DUSE_MS -I$(MS_DIR)
    26 MS_LDFLAGS=$(MS_DIR)/mapserver_i.lib
     34MS_CFLAGS=-DUSE_MS -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -I$(MS_DIR)/include
     35MS_LDFLAGS=$(MS_DIR)/lib/mapserver_i.lib
    2736MS_FILE=service_internal_ms.obj
    2837!ENDIF
  • trunk/zoo-project/zoo-kernel/service.c

    r738 r757  
    2525#include "service.h"
    2626
    27 #ifdef _MSC_VER
     27
     28#if defined(_MSC_VER) && _MSC_VER < 1800
    2829#include <stdarg.h>
    2930/**
  • trunk/zoo-project/zoo-kernel/service.h

    r738 r757  
    3535
    3636#ifdef WIN32
    37 #ifndef USE_MS
    3837#define strncasecmp _strnicmp
    3938#define strcasecmp _stricmp
    40 //#else
    41 //#define snprintf sprintf_s
     39#if defined(_MSC_VER) && _MSC_VER < 1900
     40#define snprintf _snprintf
    4241#endif
    4342#define zStrdup _strdup
     
    324323  ZOO_DLL_EXPORT void mapsToCharXXX(maps*,char***);
    325324  ZOO_DLL_EXPORT void charxxxToMaps(char***,maps**);
    326 #ifdef _MSC_VER
     325#if defined(_MSC_VER) && _MSC_VER < 1800
    327326  // snprintf for Visual Studio compiler;
    328327  // it is also used by services (e.g., GetStatus), therefore exported to shared library
    329328  ZOO_DLL_EXPORT int snprintf(char *buffer, size_t n, const char *format, ...);
    330 #endif 
     329#endif
    331330#ifdef __cplusplus
    332331}
  • trunk/zoo-project/zoo-services/gdal/contour/makefile.vc

    r450 r757  
    22!INCLUDE $(ZOOK_DIR)nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
    5 !IFDEF JS_DIR
    6 FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
    7 !ENDIF
    8 !IFDEF JDK_DIR
    9 FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
    10 !ENDIF
    11 !IFDEF PY_DIR
    12 FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
    13 !ENDIF
    14 !IF DEFINED(MS_DIR)
    15 MS_BASE=$(MS_DIR)
    16 !INCLUDE $(MS_DIR)\nmake.opt
    17 FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
    18 !ENDIF
     4FILES=$(ZOOK_DIR)/libzoo_service.lib
    195
    206cgi-env/contour_service.zo: service.c
  • trunk/zoo-project/zoo-services/gdal/dem/makefile.vc

    r444 r757  
    22!INCLUDE $(ZOOK_DIR)nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
    5 !IFDEF JS_DIR
    6 FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
    7 !ENDIF
    8 !IFDEF JDK_DIR
    9 FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
    10 !ENDIF
    11 !IFDEF PY_DIR
    12 FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
    13 !ENDIF
    14 !IFDEF MS_DIR
    15 FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
    16 !ENDIF
     4FILES=$(ZOOK_DIR)/libzoo_service.lib
    175
    186cgi-env/dem_service.zo: service.c
  • trunk/zoo-project/zoo-services/gdal/profile/makefile.vc

    r371 r757  
    22!INCLUDE $(ZOOK_DIR)/nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
    5 !IFDEF JS_DIR
    6 FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
    7 !ENDIF
    8 !IFDEF JDK_DIR
    9 FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
    10 !ENDIF
    11 !IFDEF PY_DIR
    12 FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
    13 !ENDIF
    14 !IFDEF MS_DIR
    15 FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
    16 !ENDIF
     4FILES=$(ZOOK_DIR)/libzoo_service.lib
    175
    186cgi-env/profile_service.zo: service.c
     
    219
    2210clean:
    23         erase cgi-env\gdal_service.*
     11        erase cgi-env\profile_service.*
  • trunk/zoo-project/zoo-services/gdal/translate/makefile.vc

    r373 r757  
    22!INCLUDE $(ZOOK_DIR)/nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
    5 !IFDEF JS_DIR
    6 FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
    7 !ENDIF
    8 !IFDEF JDK_DIR
    9 FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
    10 !ENDIF
    11 !IFDEF PY_DIR
    12 FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
    13 !ENDIF
    14 !IFDEF MS_DIR
    15 FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
    16 !ENDIF
     4FILES=$(ZOOK_DIR)/libzoo_service.lib
    175
    186cgi-env/translate_service.zo: service.c
  • trunk/zoo-project/zoo-services/gdal/warp/makefile.vc

    r369 r757  
    22!INCLUDE $(ZOOK_DIR)/nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
    5 !IFDEF JS_DIR
    6 FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
    7 !ENDIF
    8 !IFDEF JDK_DIR
    9 FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
    10 !ENDIF
    11 !IFDEF PY_DIR
    12 FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
    13 !ENDIF
    14 !IFDEF MS_DIR
    15 FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
    16 !ENDIF
     4FILES=$(ZOOK_DIR)/libzoo_service.lib
    175
    186cgi-env/warp_service.zo: service.c
  • trunk/zoo-project/zoo-services/ogr/base-vect-ops/makefile.vc

    r374 r757  
    22!INCLUDE $(ZOOK_DIR)/nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
    5 !IFDEF JS_DIR
    6 FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
    7 !ENDIF
    8 !IFDEF JDK_DIR
    9 FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
    10 !ENDIF
    11 !IFDEF PY_DIR
    12 FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
    13 !ENDIF
    14 !IFDEF MS_DIR
    15 FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
    16 !ENDIF
     4FILES=$(ZOOK_DIR)/libzoo_service.lib
    175
    186cgi-env/ogr_service.zo: service.c
    197        $(CPP)  /D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DZOO_SERVICE -I$(GDAL_DIR)/frmts/ $(CFLAGS) /c service.c
    20         link /dll /out:cgi-env/ogr_service.zo  $(FILES) ./service.obj $(LDFLAGS) $(GEOS_DIR)/src/geos_c_i.lib /FORCE:MULTIPLE
     8        link /dll /out:cgi-env/ogr_service.zo  ./service.obj $(FILES) $(LDFLAGS) $(GEOS_DIR)/lib/geos_c.lib /FORCE:MULTIPLE
    219
    2210clean:
    2311        erase cgi-env\ogr_service.*
    2412
    25 #       link /dll /out:cgi-env/ogr_service.zo ../../../zoo-kernel/service_internal.obj ./service.obj -L$(TOOLS)/lib/libssl32.dll.a $(GEODIR)/lib/libxml2.lib $(GEODIR)/lib/gdal_i.lib $(GEODIR)/lib/geos_c_i.lib $(TPATH)/lib/libeay32.dll.a $(TPATH)/lib/libcrypto.a $(TPATH)/lib/libssl32.dll.a $(LIBINTL_CPATH)/lib/libintl.lib
  • trunk/zoo-project/zoo-services/ogr/ogr2ogr/makefile.vc

    r1 r757  
    1 GEODIR=c:/OSGeo4W/
    2 TOOLS=c:/Users/djay/GeoLabs/tools/
     1TROOT= $(ZOOK_DIR)
     2!INCLUDE $(ZOOK_DIR)/nmake.opt
     3
     4FILES=$(ZOOK_DIR)/libzoo_service.lib
     5
    36CFLAGS=-I$(GEODIR)/include -I$(TOOLS)/include -I../../../zoo-kernel/ -I./ -DGDAL_1_5_0 -DZOO_SERVICE -DLINUX_FREE_ISSUE -DDEBUG
    47CPP=cl /TP
     
    69cgi-env/ogr2ogr_service.zo: service.c
    710        $(CPP) $(CFLAGS) /c service.c
    8         link /dll /out:cgi-env/ogr2ogr_service.zo ../../../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
     11        link /dll /out:cgi-env/ogr2ogr_service.zo ./service.obj  $(FILES) $(LDFLAGS)
    912
    1013clean:
    11         rm -f cgi-env/ogr_service.zso
     14        rm -f cgi-env/ogr2ogr_service.zso
  • trunk/zoo-project/zoo-services/utils/registry/makefile.vc

    r676 r757  
    22!INCLUDE $(ZOOK_DIR)/nmake.opt
    33
    4 FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
     4FILES=$(ZOOK_DIR)/libzoo_service.lib $(ZOOK_DIR)/server_internal.obj $(ZOOK_DIR)/response_print.obj $(ZOOK_DIR)/lex.cr.obj $(ZOOK_DIR)/lex.sr.obj $(ZOOK_DIR)/service_conf.tab.obj $(ZOOK_DIR)/service_conf.tab.obj $(ZOOK_DIR)/main_conf_read.tab.obj
     5
    56!IFDEF JS_DIR
    67FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png