[GRASS-SVN] r33887 - in grass/branches/develbranch_6: gui/wxpython/nviz lib/ogsf

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2008-10-15 11:24:35 -0400 (Wed, 15 Oct 2008)
New Revision: 33887

Modified:
   grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
   grass/branches/develbranch_6/lib/ogsf/Makefile
Log:
only include X11 paths for OPENGL_X11

Modified: grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2008-10-15 15:14:42 UTC (rev 33886)
+++ grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2008-10-15 15:24:35 UTC (rev 33887)
@@ -6,13 +6,19 @@
 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) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
+EXTRA_LIBS = $(GISLIB) $(WXWIDGETSLIB) $(OGSFLIB) $(NVIZLIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
 else
 EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS)
 endif
+ifeq ($(OPENGL_X11),1)
+EXTRA_LIBS := $(EXTRA_LIBS) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_CFLAGS := $(EXTRA_CFLAGS) $(XCFLAGS) $(XMINC)
+else
+EXTRA_LIBS := $(EXTRA_LIBS) $(OPENGLLIB) $(OPENGLULIB)
+endif
 
 LOCAL_HEADERS = nviz.h
 

Modified: grass/branches/develbranch_6/lib/ogsf/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/Makefile	2008-10-15 15:14:42 UTC (rev 33886)
+++ grass/branches/develbranch_6/lib/ogsf/Makefile	2008-10-15 15:24:35 UTC (rev 33887)
@@ -1,15 +1,25 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB)
+EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB)
 
+ifeq ($(OPENGL_X11),1)
+EXTRA_LIBS := $(EXTRA_LIBS) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB)
+else
+EXTRA_LIBS := $(EXTRA_LIBS) $(OPENGLLIB) $(OPENGLULIB)
+endif
+
 LIB_NAME = $(OGSF_LIBNAME)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
 EXTRA_INC = $(VECT_INC) $(OPENGLINC) $(TIFFINCPATH) $(FFMPEGINCPATH)
-EXTRA_CFLAGS = $(VECT_CFLAGS) $(XCFLAGS)
+EXTRA_CFLAGS = $(VECT_CFLAGS)
 
+ifeq ($(OPENGL_X11),1)
+EXTRA_CFLAGS := $(EXTRA_CFLAGS) $(XCFLAGS)
+endif
+
 default: lib
 
 #doxygen: