From 83fb3f40c9f3b61424c0e54f14fd3e99241d337a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 11 Apr 2003 10:00:56 +0000 Subject: [PATCH] Added afterescher back into the example list in runexamples.bat. Added osgSim and osgText into the geo/GNUmakefile LIBS. --- runexamples.bat | 4 ++-- src/osgPlugins/geo/GNUmakefile | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/runexamples.bat b/runexamples.bat index 6d26f528b..a189d472f 100644 --- 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 diff --git a/src/osgPlugins/geo/GNUmakefile b/src/osgPlugins/geo/GNUmakefile index db29be606..4cc0419e9 100644 --- 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