Moved include/osgTerrain/DataSet/.cpp, gdal plugin and osgdem out into the VirtualPlaneBuilder project.

Updated examples to remove DataSet/GDAL dependency.

Updated wrappers

Make/dependencies

@@ -13,7 +13,6 @@ COLLADA_INSTALLED ?= no
 COLLADA_DAE_HOME ?= /usr/local
 COLLADA_DEBUG_LIBS ?= yes
 
-GDAL_INSTALLED ?= no
 JASPER_INSTALLED ?= no
 
 FREETYPE_INSTALLED ?= yes

Make/makedefs

@@ -215,9 +215,6 @@ ifeq ($(OS),SunOS)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-
   XINE_INCLUDES     = `xine-config --cflags`
   XINE_LIBS         = `xine-config --libs`
 
@@ -308,9 +305,6 @@ ifeq ($(OS),IRIX)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-
   XINE_INCLUDES     = `xine-config --cflags`
   XINE_LIBS         = `xine-config --libs`
 
@@ -405,9 +399,6 @@ endif
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-
   XINE_INCLUDES     = `xine-config --cflags`
   XINE_LIBS         = `xine-config --libs`
 
@@ -460,9 +451,6 @@ ifeq ($(OS),FreeBSD)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-
   XINE_INCLUDES     = `xine-config --cflags`
   XINE_LIBS         = `xine-config --libs`
 
@@ -549,9 +537,6 @@ ifeq ($(OS),Darwin)
   FREETYPE_INCLUDE  = -I$(SDKPATH)/usr/X11R6/include -I$(SDKPATH)/usr/X11R6/include/freetype2
   FREETYPE_LIB      =  -L$(SDKPATH)/usr/X11R6/lib -lfreetype
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-
   XINE_INCLUDES     = `xine-config --cflags`
   XINE_LIBS         = `xine-config --libs`
 
@@ -591,10 +576,6 @@ ifeq ($(OS),CYGWIN)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-  GDAL_LIBS         += `gdal-config --dep-libs`
-
   XINE_INCLUDES     = `xine-config --cflags`
   XINE_LIBS         = `xine-config --libs`
 
@@ -654,9 +635,6 @@ ifeq ($(OS),MINGW)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = 
-  GDAL_LIBS         =  -lgdal -ljpeg -lgeotiff -ltiff -lpng -lz
-
   XINE_INCLUDES     = `xine-config --cflags`
   XINE_LIBS         = `xine-config --libs`
 
@@ -720,9 +698,6 @@ ifeq ($(OS),HP-UX)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-
   INSTXCMD           = install -c -m 755
   INSTRCMD           = install -c -m 644
 
@@ -766,9 +741,6 @@ ifeq ($(OS),AIX)
   FREETYPE_INCLUDE  = `freetype-config --cflags`
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = `gdal-config --cflags`
-  GDAL_LIBS         = `gdal-config --libs`
-
 endif
 
 

Make/makedirdefs

@@ -23,11 +23,9 @@ SRC_DIRS = \
         osgFX \
         osgShadow \
 	osgSim \
-	osgManipulator
+	osgManipulator \
+	osgTerrain \
         
-ifeq ($(GDAL_INSTALLED),yes)
-SRC_DIRS += osgTerrain
-endif
 
 ifeq ($(COMPILE_INTROSPECTION),yes)
 SRC_DIRS += \
@@ -51,11 +49,7 @@ WRAPPER_DIRS = \
 	osgText \
 	osgUtil \
 	osgViewer \
-        
 
-ifeq ($(GDAL_INSTALLED),yes)
-    WRAPPER_DIRS += osgTerrain
-endif
 
 
 ################################################################
@@ -105,10 +99,6 @@ PLUGIN_DIRS = \
 	zip \
 
 
-ifeq ($(GDAL_INSTALLED),yes)
-    PLUGIN_DIRS += gdal
-endif
-
 ifeq ($(COLLADA_INSTALLED),yes)
     PLUGIN_DIRS += dae
 endif
@@ -186,10 +176,6 @@ APPLICATION_DIRS += osgarchive \
     osgconv \
     osgviewer \
 
-ifeq ($(GDAL_INSTALLED),yes)
-    APPLICATION_DIRS += osgdem
-endif
-
 EXAMPLE_DIRS = \
 	osganimate \
 	osgautotransform \
@@ -265,19 +251,15 @@ EXAMPLE_DIRS = \
 	osgvolume \
 	osgwindows \
 	osgmanipulator \
+	osgphotoalbum \
+	osgsimulation \
+	osgfadetext
 
 
 ifeq ($(COMPILE_INTROSPECTION),yes)
     EXAMPLE_DIRS += osgintrospection
 endif
 
-ifeq ($(GDAL_INSTALLED),yes)
-    EXAMPLE_DIRS += osgphotoalbum
-    EXAMPLE_DIRS += osgbluemarble
-    EXAMPLE_DIRS += osgsimulation
-    EXAMPLE_DIRS += osgfadetext
-endif
-
 ifeq ($(GLUT_INSTALLED),yes)
     EXAMPLE_DIRS += osgGLUTsimple
     EXAMPLE_DIRS += osgGLUTkeyboardmouse