Jelajahi Sumber

strip out 64bit flags for OSX - 64bit wxpython is impossible

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@36168 15284696-431f-4ddb-bdfa-cd5b030d7da7
William Kyngesburye 16 tahun lalu
induk
melakukan
93a0f72964
2 mengubah file dengan 4 tambahan dan 0 penghapusan
  1. 2 0
      gui/wxpython/nviz/Makefile
  2. 2 0
      gui/wxpython/vdigit/Makefile

+ 2 - 0
gui/wxpython/nviz/Makefile

@@ -12,6 +12,8 @@ EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS
 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

+ 2 - 0
gui/wxpython/vdigit/Makefile

@@ -12,6 +12,8 @@ EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS
 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