Added afterescher back into the example list in runexamples.bat.

Added osgSim and osgText into the geo/GNUmakefile LIBS.
2003-04-11 10:00:56 +00:00
parent 50d1fcfea2
commit 83fb3f40c9
2 changed files with 3 additions and 9 deletions
--- a/runexamples.bat
+++ b/runexamples.bat
@@ -34,8 +34,8 @@ osgvertexprogram
 echo osgviewer Town.osg
 osgviewer Town.osg

-#echo osgviewer afterescher.geo
-#osgviewer afterescher.geo
+echo osgviewer afterescher.geo
+osgviewer afterescher.geo

 echo osgshape
 osgshape
--- a/src/osgPlugins/geo/GNUmakefile
+++ b/src/osgPlugins/geo/GNUmakefile
@@ -6,13 +6,7 @@ CXXFILES =\
 	ReaderWriterGEO.cpp


-##LIBS  += -losgText -losgSim $(OSG_LIBS) $(OTHER_LIBS)
-LIBS  = 
-
-#### MacOS X specific definitions
-ifeq ($(OS),Darwin)
-LINKARGS += -Wl,multiply_defined -Wl,suppress
-endif
+LIBS  += -losgText -losgSim $(OSG_LIBS) $(OTHER_LIBS)


 TARGET_BASENAME = geo