Parcourir la source

PYTHONLDFLAGS not needed on OSX for Python modules (from dev6 https://trac.osgeo.org/grass/changeset/33771)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33871 15284696-431f-4ddb-bdfa-cd5b030d7da7
William Kyngesburye il y a 16 ans
Parent
commit
183ff05301
2 fichiers modifiés avec 8 ajouts et 3 suppressions
  1. 6 1
      gui/wxpython/nviz/Makefile
  2. 2 2
      gui/wxpython/vdigit/Makefile

+ 6 - 1
gui/wxpython/nviz/Makefile

@@ -7,7 +7,12 @@ SOURCES := $(wildcard *.cpp) $(LIB_NAME)_wrap.cpp
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS) $(XCFLAGS) $(XMINC)
-EXTRA_LIBS = $(GISLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_LIBS = $(GISLIB) $(WXWIDGETSLIB) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
+ifeq ($(findstring darwin,$(ARCH)),darwin)
+EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
+else
+EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS)
+endif
 
 LOCAL_HEADERS = nviz.h
 

+ 2 - 2
gui/wxpython/vdigit/Makefile

@@ -7,11 +7,11 @@ SOURCES := $(wildcard *.cpp) $(LIB_NAME)_wrap.cpp
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
-EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS)
+EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
 else
-EXTRA_LIBS := $(EXTRA_LIBS) -lgdi
+EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS) -lgdi
 endif
 
 LOCAL_HEADERS = digit.h driver.h