[GRASS-SVN] r33875 - grass/branches/develbranch_6/lib/nviz

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2008-10-14 12:09:59 -0400 (Tue, 14 Oct 2008)
New Revision: 33875

Modified:
   grass/branches/develbranch_6/lib/nviz/Makefile
Log:
Only link X libraries when X11 opengl used

Modified: grass/branches/develbranch_6/lib/nviz/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/nviz/Makefile	2008-10-14 15:10:04 UTC (rev 33874)
+++ grass/branches/develbranch_6/lib/nviz/Makefile	2008-10-14 16:09:59 UTC (rev 33875)
@@ -2,19 +2,24 @@
 
 LIB_NAME = $(NVIZ_LIBNAME)
 
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB)
+EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
+EXTRA_CFLAGS = $(VECT_CFLAGS)
+
 ifeq ($(OPENGL_WINDOWS),1)
-EXTRA_LIBS += -lgdi32
+EXTRA_LIBS += $(OPENGLLIB) $(OPENGLULIB) -lgdi32
+else ifeq ($(OPENGL_X11),1)
+EXTRA_LIBS += $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_CFLAGS += $(XCFLAGS)
+else
+EXTRA_LIBS += $(OPENGLLIB) $(OPENGLULIB)
 endif
 
 EXTRA_INC = $(VECT_INC) $(OPENGLINC) $(TIFFINCPATH) $(FFMPEGINCPATH)
 
-EXTRA_CFLAGS = $(VECT_CFLAGS) $(XCFLAGS)
-
 default: lib
 
 # doxygen