[mapserver-commits] r10748 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2010-11-20 15:50:57 -0800 (Sat, 20 Nov 2010)
New Revision: 10748

Modified:
   branches/branch-5-6/mapserver/nmake.opt
Log:
Remove the OpenGL support from the Windows builds as it doesn't properly implemented in the stable branch

Modified: branches/branch-5-6/mapserver/nmake.opt
===================================================================
--- branches/branch-5-6/mapserver/nmake.opt	2010-11-20 23:39:58 UTC (rev 10747)
+++ branches/branch-5-6/mapserver/nmake.opt	2010-11-20 23:50:57 UTC (rev 10748)
@@ -290,11 +290,6 @@
 #
 AGG=-DUSE_AGG
 
-# If you wish to use OpenGl
-#
-#OGL=-DUSE_OGL
-#FTGL_DIR=$(MS_BASE)\..\ftgl-2.1.3~rc5
-
 # Cairo renderer support 
 #
 #CAIRO=-DUSE_CAIRO
@@ -751,12 +746,6 @@
 #MING_VERSION=-DMING_VERSION_03
 !ENDIF
 
-# Setup OGL
-!IFDEF OGL
-OGL_INC= -I$(FTGL_DIR)\src
-OGL_LIB= $(FTGL_DIR)\msvc\build\ftgl_static.lib opengl32.lib glu32.lib user32.lib gdi32.lib
-!ENDIF
-
 # Setup CAIRO
 !IFDEF CAIRO
 CAIRO_INC= -I$(CAIRO_DIR)\src
@@ -841,7 +830,7 @@
      $(CURL_LIB)  $(MING_LIB) $(PDF_LIB) \
      $(WINSOCK_LIB) $(POSTGIS_LIB) $(IMGGEN_LIB) $(ERR_LIB) \
      $(ORACLE_LIB) $(SDE_LIB) $(ICONV_LIB) $(FCGILIB) $(GEOS_LIB) \
-     $(LIBXML_LIB) $(AGG_LIB) $(OGL_LIB) $(CAIRO_LIB) $(FRIBIDI_LIB)
+     $(LIBXML_LIB) $(AGG_LIB) $(CAIRO_LIB) $(FRIBIDI_LIB)
 !ENDIF
 
 LIBS=$(MS_LIB) $(EXTERNAL_LIBS)
@@ -853,7 +842,7 @@
          $(CURL_INC) $(MING_INC) $(PDF_INC) $(POSTGIS_INC) \
          $(IMGGEN_INC) $(ERR_INC) $(ORACLE_INC) $(SDE_INC)\
          $(ICONV_INC) $(FCGIINC) $(GEOS_INC) $(ZLIB_INC) $(LIBXML_INC) \
-         $(AGG_INC) $(OGL_INC) $(CAIRO_INC) $(PNG_INC) $(FRIBIDI_INC)
+         $(AGG_INC) $(CAIRO_INC) $(PNG_INC) $(FRIBIDI_INC)
 !ENDIF
 
 
@@ -865,7 +854,7 @@
           $(WFS) $(WFSCLIENT) $(WCS) $(PDF) $(EGIS) \
           $(USE_GD_ANTIALIAS) $(ORACLE) $(MING_VERSION) \
           $(SDE_OPT) $(ICONV) $(GEOS) $(ZLIB) $(SOS)  $(XML2_ENABLED) $(AGG) \
-          $(OGL) $(CAIRO) $(RGBA_PNG_ENABLED) $(FRIBIDI) \
+          $(CAIRO) $(RGBA_PNG_ENABLED) $(FRIBIDI) \
           $(MS_ENABLE_CGI_CL_DEBUG_ARGS)
 
 !IFDEF WIN64