Merged linkage changes from Duncan Cavens to help the OSG osgtext and osghud

demo's build cleanly even when a previous version of the OSG is installed.
This commit is contained in:
Robert Osfield
2003-02-12 14:39:51 +00:00
parent 0e8154d3d3
commit 28732e3451
2 changed files with 4 additions and 4 deletions

View File

@@ -4,8 +4,8 @@ include $(TOPDIR)/Make/makedefs
CXXFILES =\
osghud.cpp\
LINKARGS += -L/usr/local/lib
LIBS += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
#LINKARGS += -L/usr/local/lib
LIBS += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
INSTFILES = \
$(CXXFILES)\

View File

@@ -4,8 +4,8 @@ include $(TOPDIR)/Make/makedefs
CXXFILES =\
main.cpp\
LINKARGS += -L/usr/local/lib
LIBS += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
#LINKARGS += -L/usr/local/lib
LIBS += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)
INSTFILES = \
$(CXXFILES)\