[GRASS-SVN] r37408 - in grass/branches/releasebranch_6_4: gui/wxpython/nviz gui/wxpython/vdigit include/Make

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-05-23 15:30:11 -0400 (Sat, 23 May 2009)
New Revision: 37408

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/nviz/Makefile
   grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile
   grass/branches/releasebranch_6_4/include/Make/Platform.make.in
Log:
support 64bit build with 32bit wxpython on OSX (from dev6 r37407)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/nviz/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/nviz/Makefile	2009-05-23 19:25:56 UTC (rev 37407)
+++ grass/branches/releasebranch_6_4/gui/wxpython/nviz/Makefile	2009-05-23 19:30:11 UTC (rev 37408)
@@ -2,6 +2,13 @@
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
+ifeq ($(findstring darwin,$(ARCH)),darwin)
+ifneq ($(WX_ISOSX64BIT),1)
+CFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(CFLAGS)))
+LDFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(LDFLAGS)))
+endif
+endif
+
 LIB_NAME = grass6_wxnviz
 
 SHLIB = $(OBJDIR)/_$(LIB_NAME).so

Modified: grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile	2009-05-23 19:25:56 UTC (rev 37407)
+++ grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile	2009-05-23 19:30:11 UTC (rev 37408)
@@ -2,6 +2,13 @@
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
+ifeq ($(findstring darwin,$(ARCH)),darwin)
+ifneq ($(WX_ISOSX64BIT),1)
+CFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(CFLAGS)))
+LDFLAGS := $(subst -arch ppc64,,$(subst -arch x86_64,,$(LDFLAGS)))
+endif
+endif
+
 LIB_NAME = grass6_wxvdigit
 
 SHLIB = $(OBJDIR)/_$(LIB_NAME).so

Modified: grass/branches/releasebranch_6_4/include/Make/Platform.make.in
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Platform.make.in	2009-05-23 19:25:56 UTC (rev 37407)
+++ grass/branches/releasebranch_6_4/include/Make/Platform.make.in	2009-05-23 19:30:11 UTC (rev 37408)
@@ -222,6 +222,8 @@
 WXWIDGETSCPPFLAGS   = @WXWIDGETSCPPFLAGS@
 WXWIDGETSLIB        = @WXWIDGETSLIB@
 USE_WXWIDGETS       = @USE_WXWIDGETS@
+# set from configure when 64bit wxWidgets becomes possible on OSX
+WX_ISOSX64BIT       = 
 
 #regex
 REGEXINCPATH        = @REGEXINCPATH@