[GRASS-SVN] r40163 - in grass/trunk: gui/wxpython/nviz include swig/python

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-12-29 10:46:22 -0500 (Tue, 29 Dec 2009)
New Revision: 40163

Modified:
   grass/trunk/gui/wxpython/nviz/setup.py
   grass/trunk/include/gisdefs.h
   grass/trunk/swig/python/Makefile
Log:
Windows fixes.
 G_rc_path() isn't defined on Windows, so don't declare it
 swig/python needs -D__MINGW32__ to get conditional declarations correct
 swig/python needs $(INTLLIB) (the Windows version of <libintl.h> redirects *printf)
 nviz/setup.py needs to have quotes escaped (as already done for vdigit)


Modified: grass/trunk/gui/wxpython/nviz/setup.py
===================================================================
--- grass/trunk/gui/wxpython/nviz/setup.py	2009-12-29 12:54:28 UTC (rev 40162)
+++ grass/trunk/gui/wxpython/nviz/setup.py	2009-12-29 15:46:22 UTC (rev 40163)
@@ -10,7 +10,12 @@
 
 from distutils.core import setup, Extension
 
-macros = [('PACKAGE', '"grasslibs"')]
+if sys.platform == "win32":
+    package = '\\"grasslibs\\"'
+else:
+    package = '"grasslibs"'
+macros = [('PACKAGE', package)]
+
 inc_dirs = [os.path.join(os.path.normpath(os.getenv('ARCH_DISTDIR')), 'include'),
 	    os.path.join(os.path.normpath(os.getenv('GISBASE')), 'include')]
 lib_dirs = [os.path.join(os.path.normpath(os.getenv('ARCH_DISTDIR')), 'lib'),

Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h	2009-12-29 12:54:28 UTC (rev 40162)
+++ grass/trunk/include/gisdefs.h	2009-12-29 15:46:22 UTC (rev 40163)
@@ -605,7 +605,9 @@
 void G_trim_decimal(char *);
 
 /* user_config.c */
+#ifndef __MINGW32__
 char *G_rc_path(const char *, const char *);
+#endif
 
 /* verbose.c */
 int G_verbose(void);

Modified: grass/trunk/swig/python/Makefile
===================================================================
--- grass/trunk/swig/python/Makefile	2009-12-29 12:54:28 UTC (rev 40162)
+++ grass/trunk/swig/python/Makefile	2009-12-29 15:46:22 UTC (rev 40163)
@@ -45,6 +45,11 @@
 EXTRA_CLEAN_FILES := $(foreach M,$(MODULES),$(M)_wrap.o $(M)_wrap.c $(M).pyc $(M).py _$(M).so)
 CLEAN_SUBDIRS = NumPtr
 
+ifneq ($(MINGW),)
+SWIGFLAGS += -D__MINGW32__
+EXTRA_LIBS = $(INTLLIB)
+endif
+
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
 PYDIR = $(ETC)/python