don't link wx libs for OSX, X include paths only for OpenGL X11 (from dev6 https://trac.osgeo.org/grass/changeset/37620)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37622 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/nviz/setup.py

@@ -27,11 +27,15 @@ extras = []
 for flag in ('GDALCFLAGS',
              'GDALLIBS',
              'WXWIDGETSCXXFLAGS',
-             'WXWIDGETSLIB',
-             'XCFLAGS',
+             '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= [

gui/wxpython/vdigit/setup.py

@@ -28,9 +28,10 @@ extras = []
 for flag in ('GDALCFLAGS',
              'GDALLIBS',
              'GEOSCFLAGS',
-             '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= [