[GRASS-SVN] r36168 - in grass/trunk/gui/wxpython: nviz vdigit

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-03-01 23:20:24 -0500 (Sun, 01 Mar 2009)
New Revision: 36168

Modified:
   grass/trunk/gui/wxpython/nviz/Makefile
   grass/trunk/gui/wxpython/vdigit/Makefile
Log:
strip out 64bit flags for OSX - 64bit wxpython is impossible

Modified: grass/trunk/gui/wxpython/nviz/Makefile
===================================================================
--- grass/trunk/gui/wxpython/nviz/Makefile	2009-03-02 04:17:48 UTC (rev 36167)
+++ grass/trunk/gui/wxpython/nviz/Makefile	2009-03-02 04:20:24 UTC (rev 36168)
@@ -12,6 +12,8 @@
 EXTRA_LIBS = $(GISLIB) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
+CXXFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(CXXFLAGS)))
+LDFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(LDFLAGS)))
 else
 EXTRA_LIBS := $(PYTHONLDFLAGS) $(WXWIDGETSLIB) $(EXTRA_LIBS)
 endif

Modified: grass/trunk/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/trunk/gui/wxpython/vdigit/Makefile	2009-03-02 04:17:48 UTC (rev 36167)
+++ grass/trunk/gui/wxpython/vdigit/Makefile	2009-03-02 04:20:24 UTC (rev 36168)
@@ -12,6 +12,8 @@
 EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
+CXXFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(CXXFLAGS)))
+LDFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(LDFLAGS)))
 else
 EXTRA_LIBS := $(PYTHONLDFLAGS) $(WXWIDGETSLIB) $(EXTRA_LIBS)
 endif