Ignore:
Timestamp:
Oct 14, 2013, 11:24:53 AM (6 years ago)
Author:
djay
Message:

Fixing issue on Linux / Mac OS X about language gesture. Fixing strange issue in some services using MapServer? support on WIN32. Use the MapServer? nmake.opt to make sure to get all the definitions settled correctly.

Location:
trunk/zoo-project/zoo-kernel
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/makefile.vc

    r384 r444  
    66#
    77
     8!IF DEFINED(MS_DIR)
     9MS_BASE=$(MS_DIR)
     10!INCLUDE $(MS_DIR)\nmake.opt
     11!ENDIF
    812!INCLUDE nmake.opt
    913
  • trunk/zoo-project/zoo-kernel/nmake.opt

    r392 r444  
    3636PYTHON_CPATH=$(PY_DIR)
    3737
    38 CFLAGS=$(CFLAGS1) /nologo /MD /W3 /EHsc /Ox /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I$(ZOOK_DIR) -I./ $(JAVA_CFLAGS) $(MS_CFLAGS) -I$(TROOT)\..\..\thirds\dirent-win32 -I$(INTL_DIR) -I$(CURL_DIR)\include -I$(XML2_DIR)\include -I$(GDAL_DIR)\port $(JS_CFLAGS) -I$(GDAL_DIR)\ogr -I$(GDAL_DIR)\gcore -I$(GD_DIR) -I$(ICONV_DIR) -I$(TROOT)\..\..\thirds\include -I$(TROOT)\..\..\thirds\cgic206 -I$(PYTHON_CPATH)\include -I$(SSL_DIR)/inc32 -I$(FCGI_DIR)\include $(PY_CFLAGS) -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
     38CFLAGS=$(MS_DEFS) $(INCLUDES) $(CFLAGS1) /nologo /MD /W3 /EHsc /Ox /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I$(ZOOK_DIR) -I./ $(JAVA_CFLAGS) $(MS_CFLAGS) -I$(TROOT)\..\..\thirds\dirent-win32 -I$(INTL_DIR) -I$(CURL_DIR)\include -I$(XML2_DIR)\include -I$(GDAL_DIR)\port $(JS_CFLAGS) -I$(GDAL_DIR)\ogr -I$(GDAL_DIR)\gcore -I$(GD_DIR) -I$(ICONV_DIR) -I$(TROOT)\..\..\thirds\include -I$(TROOT)\..\..\thirds\cgic206 -I$(PYTHON_CPATH)\include -I$(SSL_DIR)/inc32 -I$(FCGI_DIR)\include $(PY_CFLAGS) -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
    3939
    4040LDFLAGSCGI=$(TROOT)/../../thirds/cgic206/libcgic.lib
  • trunk/zoo-project/zoo-kernel/service.h

    r379 r444  
    2929
    3030#ifdef WIN32
     31#ifndef USE_MS
    3132#define strncasecmp _strnicmp
    3233#define strcasecmp _stricmp
     34#endif
    3335#ifndef snprintf
    3436#define snprintf sprintf_s
     
    4244#endif
    4345
     46#ifdef WIN32
     47#ifdef USE_MS
     48#include <mapserver.h>
     49#endif
     50#endif
    4451#include <stdlib.h>
    4552#include <ctype.h>
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r441 r444  
    599599    translateChar(tmp,'-','_');
    600600    setlocale (LC_ALL, tmp);
    601 #ifdef WIN32
     601#ifndef WIN32
     602    setenv("LC_ALL",tmp,1);
     603#else
    602604    char tmp1[12];
    603605    sprintf(tmp1,"LC_ALL=%s",tmp);
     
    608610  else{
    609611    setlocale (LC_ALL, "en_US");
    610 #ifdef WIN32
     612#ifndef WIN32
     613    setenv("LC_ALL","en_US",1);
     614#else
    611615    char tmp1[12];
    612616    sprintf(tmp1,"LC_ALL=en_US");
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