[GRASS-SVN] r37621 - in grass/branches/releasebranch_6_4/gui/wxpython: nviz vdigit

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-05-30 11:42:52 -0400 (Sat, 30 May 2009)
New Revision: 37621

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/nviz/setup.py
   grass/branches/releasebranch_6_4/gui/wxpython/vdigit/setup.py
Log:
don't link wx libs for OSX, X include paths only for OpenGL X11 (from dev6 r37620)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/nviz/setup.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/nviz/setup.py	2009-05-30 15:39:58 UTC (rev 37620)
+++ grass/branches/releasebranch_6_4/gui/wxpython/nviz/setup.py	2009-05-30 15:42:52 UTC (rev 37621)
@@ -27,12 +27,15 @@
 for flag in ('GDALCFLAGS',
              'GDALLIBS',
              'WXWIDGETSCXXFLAGS',
-             'WXWIDGETSLIB',
-             'XCFLAGS',
-             'XMINC',
+             'OPENGLINC',
              'OPENGLLIB',
              'OPENGLULIB'):
     update_opts(flag, macros, inc_dirs, lib_dirs, libs, extras)
+if sys.platform != 'darwin':
+    update_opts('WXWIDGETSLIB', macros, inc_dirs, lib_dirs, libs, extras)
+if variables['OPENGL_X11'] == '1':
+    for flag in ('XCFLAGS', 'XMINC'):
+        update_opts(flag, macros, inc_dirs, lib_dirs, libs, extras)
 
 setup(
     ext_modules= [

Modified: grass/branches/releasebranch_6_4/gui/wxpython/vdigit/setup.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/vdigit/setup.py	2009-05-30 15:39:58 UTC (rev 37620)
+++ grass/branches/releasebranch_6_4/gui/wxpython/vdigit/setup.py	2009-05-30 15:42:52 UTC (rev 37621)
@@ -27,9 +27,10 @@
 
 for flag in ('GDALCFLAGS',
              'GDALLIBS',
-             'WXWIDGETSCXXFLAGS',
-             'WXWIDGETSLIB'):
+             'WXWIDGETSCXXFLAGS'):
     update_opts(flag, macros, inc_dirs, lib_dirs, libs, extras)
+if sys.platform != 'darwin':
+    update_opts('WXWIDGETSLIB', macros, inc_dirs, lib_dirs, libs, extras)
 
 setup(
     ext_modules= [