diff --git a/examples/osgGLUTkeyboardmouse/GNUmakefile b/examples/osgGLUTkeyboardmouse/GNUmakefile index 135271b0b..b4d76b67e 100644 --- a/examples/osgGLUTkeyboardmouse/GNUmakefile +++ b/examples/osgGLUTkeyboardmouse/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgGLUTkeyboardmouse.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgGLUTkeyboardmouse/GNUmakefile.inst b/examples/osgGLUTkeyboardmouse/GNUmakefile.inst index 483deb9a9..d2d260cd9 100644 --- a/examples/osgGLUTkeyboardmouse/GNUmakefile.inst +++ b/examples/osgGLUTkeyboardmouse/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgGLUTkeyboardmouse.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgGLUTkeyboardmouse diff --git a/examples/osgGLUTsimple/GNUmakefile b/examples/osgGLUTsimple/GNUmakefile index a75d66926..769c02db1 100644 --- a/examples/osgGLUTsimple/GNUmakefile +++ b/examples/osgGLUTsimple/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgGLUTsimple.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgGLUTsimple/GNUmakefile.inst b/examples/osgGLUTsimple/GNUmakefile.inst index e4e203184..994dcac6e 100644 --- a/examples/osgGLUTsimple/GNUmakefile.inst +++ b/examples/osgGLUTsimple/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgGLUTsimple.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgGLUTsimple diff --git a/examples/osgcamera/GNUmakefile b/examples/osgcamera/GNUmakefile index c44bd7a25..5608e0e48 100644 --- a/examples/osgcamera/GNUmakefile +++ b/examples/osgcamera/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgcamera.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -lOpenThreads +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -lOpenThreads INSTFILES = \ $(CXXFILES)\ @@ -13,15 +13,8 @@ INSTFILES = \ EXEC = osgcamera INC += $(X_INC) -LDFLAGS += -L/usr/X11R6/lib +#LDFLAGS += -L/usr/X11R6/lib -ifeq ($(USE_OPEN_THREAD),1) - DEF += -D_USE_OPEN_THREAD - INC += $(INC_OPEN_THREAD) - LDFLAGS += $(LIB_OPEN_THREAD) - LIBS += -lOpenThread -endif - include $(TOPDIR)/Make/makerules diff --git a/examples/osgcamera/GNUmakefile.inst b/examples/osgcamera/GNUmakefile.inst index d1a97a6b5..9b9ed4c90 100644 --- a/examples/osgcamera/GNUmakefile.inst +++ b/examples/osgcamera/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgcamera.cpp\ -LIBS += -losgViewer -losgDB --losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgDB --losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgcamera diff --git a/examples/osgkeyboardmouse/GNUmakefile b/examples/osgkeyboardmouse/GNUmakefile index bc9ab0db8..c573ecbfe 100644 --- a/examples/osgkeyboardmouse/GNUmakefile +++ b/examples/osgkeyboardmouse/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgkeyboardmouse.cpp\ -LIBS += -losgViewer -losgFX -losgViewer -losgGA -losgDB -losgUtil -losg $(X_LIBS) $(OTHER_LIBS) -lOpenThreads +LIBS += -losgViewer -losgText -losgFX -losgGA -losgDB -losgUtil -losg $(X_LIBS) $(OTHER_LIBS) -lOpenThreads INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgkeyboardmouse/GNUmakefile.inst b/examples/osgkeyboardmouse/GNUmakefile.inst index 30c982c03..253b0cb67 100644 --- a/examples/osgkeyboardmouse/GNUmakefile.inst +++ b/examples/osgkeyboardmouse/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgkeyboardmouse.cpp\ -LIBS += -losgViewer -losgFX -losgViewer -losgGA -losgDB --losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgFX -losgGA -losgDB --losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgkeyboardmouse diff --git a/examples/osgsimple/GNUmakefile b/examples/osgsimple/GNUmakefile index e78f83051..b5233800f 100644 --- a/examples/osgsimple/GNUmakefile +++ b/examples/osgsimple/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimple.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -lOpenThreads +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -lOpenThreads INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgsimpleviewerFLTK/GNUmakefile b/examples/osgsimpleviewerFLTK/GNUmakefile index 3549ecf32..96a7f8bc2 100644 --- a/examples/osgsimpleviewerFLTK/GNUmakefile +++ b/examples/osgsimpleviewerFLTK/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerFLTK.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lfltk -lfltk_gl $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lfltk -lfltk_gl $(GL_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgsimpleviewerFLTK/GNUmakefile.inst b/examples/osgsimpleviewerFLTK/GNUmakefile.inst index b9916f814..bc2e61664 100644 --- a/examples/osgsimpleviewerFLTK/GNUmakefile.inst +++ b/examples/osgsimpleviewerFLTK/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerQT3.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgsimpleviewerQT3 diff --git a/examples/osgsimpleviewerGLUT/GNUmakefile b/examples/osgsimpleviewerGLUT/GNUmakefile index 4e517d91d..b2bb0e675 100644 --- a/examples/osgsimpleviewerGLUT/GNUmakefile +++ b/examples/osgsimpleviewerGLUT/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerGLUT.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg $(GLUT_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgsimpleviewerGLUT/GNUmakefile.inst b/examples/osgsimpleviewerGLUT/GNUmakefile.inst index 8648908df..a439eb769 100644 --- a/examples/osgsimpleviewerGLUT/GNUmakefile.inst +++ b/examples/osgsimpleviewerGLUT/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerGLUT.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lglut $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgsimpleviewerGLUT diff --git a/examples/osgsimpleviewerQT3/GNUmakefile b/examples/osgsimpleviewerQT3/GNUmakefile index e51141bd5..96b566238 100644 --- a/examples/osgsimpleviewerQT3/GNUmakefile +++ b/examples/osgsimpleviewerQT3/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerQT3.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgsimpleviewerQT3/GNUmakefile.inst b/examples/osgsimpleviewerQT3/GNUmakefile.inst index b9916f814..bc2e61664 100644 --- a/examples/osgsimpleviewerQT3/GNUmakefile.inst +++ b/examples/osgsimpleviewerQT3/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerQT3.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgsimpleviewerQT3 diff --git a/examples/osgsimpleviewerQT4/GNUmakefile b/examples/osgsimpleviewerQT4/GNUmakefile index 7e98096b0..1dbbf5082 100644 --- a/examples/osgsimpleviewerQT4/GNUmakefile +++ b/examples/osgsimpleviewerQT4/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerQT4.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lQtOpenGL -lQtGui -lQtCore $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lQtOpenGL -lQtGui -lQtCore $(GL_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgsimpleviewerQT4/GNUmakefile.inst b/examples/osgsimpleviewerQT4/GNUmakefile.inst index 097a5bb59..658c8ff91 100644 --- a/examples/osgsimpleviewerQT4/GNUmakefile.inst +++ b/examples/osgsimpleviewerQT4/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerQT4.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg -lqt-mt $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgsimpleviewerQT4 diff --git a/examples/osgsimpleviewerSDL/GNUmakefile b/examples/osgsimpleviewerSDL/GNUmakefile index 079d6ec7c..363951f8f 100644 --- a/examples/osgsimpleviewerSDL/GNUmakefile +++ b/examples/osgsimpleviewerSDL/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerSDL.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg `sdl-config --libs` $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg `sdl-config --libs` $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) INSTFILES = \ $(CXXFILES)\ diff --git a/examples/osgsimpleviewerSDL/GNUmakefile.inst b/examples/osgsimpleviewerSDL/GNUmakefile.inst index a28029959..03f5a715f 100644 --- a/examples/osgsimpleviewerSDL/GNUmakefile.inst +++ b/examples/osgsimpleviewerSDL/GNUmakefile.inst @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgsimpleviewerSDL.cpp\ -LIBS += -losgViewer -losgGA -losgDB -losgUtil -losg `sdl-config --libs` $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg `sdl-config --libs` $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) EXEC = osgsimpleviewerSDL diff --git a/examples/osgslice/GNUmakefile b/examples/osgslice/GNUmakefile index df01b92bb..10f14c364 100644 --- a/examples/osgslice/GNUmakefile +++ b/examples/osgslice/GNUmakefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ osgslice.cpp\ -LIBS += -losgViewer -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -lOpenThreads +LIBS += -losgViewer -losgText -losgGA -losgDB -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) -lOpenThreads INSTFILES = \ $(CXXFILES)\