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

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-01-30 13:38:34 -0500 (Fri, 30 Jan 2009)
New Revision: 35678

Modified:
   grass/trunk/gui/wxpython/nviz/Makefile
   grass/trunk/gui/wxpython/vdigit/Makefile
Log:
don't link WXWIDGETSLIB on OSX - dynamic_lookup handles it

Modified: grass/trunk/gui/wxpython/nviz/Makefile
===================================================================
--- grass/trunk/gui/wxpython/nviz/Makefile	2009-01-30 18:36:35 UTC (rev 35677)
+++ grass/trunk/gui/wxpython/nviz/Makefile	2009-01-30 18:38:34 UTC (rev 35678)
@@ -9,11 +9,11 @@
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS) $(XCFLAGS) $(XMINC)
-EXTRA_LIBS = $(GISLIB) $(WXWIDGETSLIB) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_LIBS = $(GISLIB) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
 else
-EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS)
+EXTRA_LIBS := $(PYTHONLDFLAGS) $(WXWIDGETSLIB) $(EXTRA_LIBS)
 endif
 
 LOCAL_HEADERS = nviz.h

Modified: grass/trunk/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/trunk/gui/wxpython/vdigit/Makefile	2009-01-30 18:36:35 UTC (rev 35677)
+++ grass/trunk/gui/wxpython/vdigit/Makefile	2009-01-30 18:38:34 UTC (rev 35678)
@@ -9,11 +9,11 @@
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
-EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB)
+EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
 else
-EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS)
+EXTRA_LIBS := $(PYTHONLDFLAGS) $(WXWIDGETSLIB) $(EXTRA_LIBS)
 endif
 
 LOCAL_HEADERS = digit.h driver.h pseudodc.h