rpms/OpenSceneGraph/devel OpenSceneGraph-1.2.diff,1.1,1.2

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26987

Modified Files:
	OpenSceneGraph-1.2.diff 
Log Message:
Preps for gdal.

OpenSceneGraph-1.2.diff:

Index: OpenSceneGraph-1.2.diff
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph-1.2.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenSceneGraph-1.2.diff	4 Oct 2006 15:38:32 -0000	1.1
+++ OpenSceneGraph-1.2.diff	21 Mar 2007 06:48:11 -0000	1.2
@@ -1,4 +1,3 @@
-? diff
 Index: OpenSceneGraph/Make/instexamplesrc
 ===================================================================
 RCS file: /var/cvs/local/OSG/OpenSceneGraph/Make/instexamplesrc,v
@@ -135,6 +134,24 @@
  
  TARGET_BASENAME = tiff
  include $(TOPDIR)/Make/cygwin_plugin_def
+Index: OpenSceneGraph/src/osgWrappers/osgTerrain/GNUmakefile
+===================================================================
+RCS file: /var/cvs/local/OSG/OpenSceneGraph/src/osgWrappers/osgTerrain/GNUmakefile,v
+retrieving revision 1.1.1.1
+retrieving revision 1.1.1.1.2.1
+diff -u -r1.1.1.1 -r1.1.1.1.2.1
+--- OpenSceneGraph/src/osgWrappers/osgTerrain/GNUmakefile	4 Oct 2006 08:01:36 -0000	1.1.1.1
++++ OpenSceneGraph/src/osgWrappers/osgTerrain/GNUmakefile	19 Mar 2007 15:17:58 -0000	1.1.1.1.2.1
+@@ -6,7 +6,8 @@
+ 	HeightFieldNode.cpp\
+ 	HeightFieldRenderer.cpp\
+ 
+-LIBS   += -losgTerrain -losg -losgIntrospection -losgDB -losgUtil -losgFX  $(GL_LIBS) $(OTHER_LIBS)
++INC += $(GDAL_INCLUDES)
++LIBS   += -losgTerrain -losg -losgIntrospection -losgDB -losgUtil -losgFX $(GDAL_LIBS) $(GL_LIBS) $(OTHER_LIBS)
+ 
+ OPTF = -O
+ 
 Index: OpenThreads/Make/libdefs
 ===================================================================
 RCS file: OpenThreads/Make/libdefs