[GRASS-SVN] r36167 - in grass/branches/develbranch_6/gui/wxpython:
nviz vdigit
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Mar 1 23:17:48 EST 2009
Author: kyngchaos
Date: 2009-03-01 23:17:48 -0500 (Sun, 01 Mar 2009)
New Revision: 36167
Modified:
grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
Log:
strip out 64bit flags for OSX - 64bit wxpython is impossible
Modified: grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/nviz/Makefile 2009-03-01 15:05:51 UTC (rev 36166)
+++ grass/branches/develbranch_6/gui/wxpython/nviz/Makefile 2009-03-02 04:17:48 UTC (rev 36167)
@@ -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/branches/develbranch_6/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile 2009-03-01 15:05:51 UTC (rev 36166)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile 2009-03-02 04:17:48 UTC (rev 36167)
@@ -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
More information about the grass-commit
mailing list