From 9e54b0020548d5fb9e1948ef02854daf2e0713ac Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 23 Mar 2005 20:48:50 +0000 Subject: [PATCH] From Randall Hopper, with small order tweak from Robert and addition to GNUmakefile.inst, added $(GDAL_LIBS) to fix build under FreeBSD. --- applications/osgdem/GNUmakefile | 2 +- applications/osgdem/GNUmakefile.inst | 2 +- examples/osgsimulation/GNUmakefile | 2 +- examples/osgsimulation/GNUmakefile.inst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/osgdem/GNUmakefile b/applications/osgdem/GNUmakefile index 6eb6ef28d..528bc176a 100644 --- a/applications/osgdem/GNUmakefile +++ b/applications/osgdem/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgdem.cpp\ -LIBS += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgText -losgGA -losgDB -losgUtil -losg $(GDAL_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/applications/osgdem/GNUmakefile.inst b/applications/osgdem/GNUmakefile.inst index c2f7c365f..45e88b0a1 100644 --- a/applications/osgdem/GNUmakefile.inst +++ b/applications/osgdem/GNUmakefile.inst @@ -5,7 +5,7 @@ CXXFILES =\ osgdem.cpp\ -LIBS += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgDB -losgText -losgUtil -losg $(GDAL_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgdem diff --git a/examples/osgsimulation/GNUmakefile b/examples/osgsimulation/GNUmakefile index 21e960c9e..8c4002b8c 100644 --- a/examples/osgsimulation/GNUmakefile +++ b/examples/osgsimulation/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimulation.cpp\ -LIBS += -losgTerrain -losgFX -losgGL2 -losgProducer -lProducer -losgParticle -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgTerrain -losgFX -losgGL2 -losgProducer -lProducer -losgParticle -losgSim -losgText -losgGA -losgDB -losgUtil -losg $(GDAL_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgsimulation/GNUmakefile.inst b/examples/osgsimulation/GNUmakefile.inst index 4d5b8b012..aacb0e467 100644 --- a/examples/osgsimulation/GNUmakefile.inst +++ b/examples/osgsimulation/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimulation.cpp\ -LIBS += -losgProducer -lProducer -losgDB -losgParticle -losgSim -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgProducer -lProducer -losgDB -losgParticle -losgSim -losgText -losgUtil -losg $(GDAL_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgsimulation