Reinstated Norman Vine's TARGET_BASENAME variable in the makefiles and

added prefixes and suffixes to libs and plugins. ALl this to accomodate cygwin... Also added INST_SYS_PREFIX and INST_SHARE_PREFIX for installation, as well as "standardizing" the install locations for the various platforms.
2002-04-03 17:42:12 +00:00
parent 12043abd40
commit e0adca775b
37 changed files with 233 additions and 105 deletions
--- a/src/Demos/Makefile
+++ b/src/Demos/Makefile
@@ -14,6 +14,7 @@ DIRS = \
 	osgstereoimage\
 	osgtexture\
 	osgviews\
+	osgversion\
 	sgv

 LEFT_TO_DO =\
--- a/src/Demos/osgversion/Makefile
+++ b/src/Demos/osgversion/Makefile
@@ -0,0 +1,11 @@
+TOPDIR = ../../..
+include $(TOPDIR)/Make/makedefs 
+
+CXXFILES =\
+	osgversion.cpp\
+
+LIBS     += $(OSG_LIBS) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
+
+EXEC = osgversion
+
+include $(TOPDIR)/Make/makerules 
--- a/src/Demos/osgversion/osgversion.cpp
+++ b/src/Demos/osgversion/osgversion.cpp
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include <osg/Version>
+
+
+int main( int argc, char **argv )
+{
+    printf( "%s\n", osgGetVersion() );
+    return 0;
+}
--- a/src/osg/Makefile
+++ b/src/osg/Makefile
@@ -67,6 +67,7 @@ DEF     += -DSG_LIBRARY

 LIBS    += $(GL_LIBS) $(OTHER_LIBS)

-LIB     = libosg.$(SO_EXT)
+TARGET_BASENAME = osg
+LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgDB/Makefile
+++ b/src/osgDB/Makefile
@@ -20,6 +20,7 @@ CXXFILES =\
 LIBS += -losg $(OTHER_LIBS) $(DYNAMICLIBRARYLIB) 
 DEF  += -DOSGDB_LIBRARY

-LIB = libosgDB.$(PLUGIN_EXT)
+TARGET_BASENAME = osgDB
+LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgGLUT/Makefile
+++ b/src/osgGLUT/Makefile
@@ -9,6 +9,7 @@ CXXFILES =\

 LIBS += $(GLUT_LIB) -losgUtil -losgDB -losg $(OTHER_LIBS)
 DEF  += -DOSGGLUT_LIBRARY
-LIB = libosgGLUT.$(SO_EXT)
+TARGET_BASENAME = osgGLUT
+LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/Makefile
+++ b/src/osgPlugins/Makefile
@@ -1,10 +1,7 @@
 TOPDIR = ../..
 include $(TOPDIR)/Make/makedefs

-DIRS = osg rgb lib3ds flt obj lwo dw bmp pic tga osgtgz tgz zip  
-
-# The following are giving me problems on SUN
-#DIRS += txp
+DIRS = osg rgb lib3ds flt obj lwo txp dw bmp pic tga osgtgz tgz zip  

 # comment in if you have Performer installed.
 # DIRS += pfb
--- a/src/osgPlugins/bmp/Makefile
+++ b/src/osgPlugins/bmp/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_bmp.$(PLUGIN_EXT)
+TARGET_BASENAME = bmp
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/dw/Makefile
+++ b/src/osgPlugins/dw/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_dw.$(PLUGIN_EXT)
+TARGET_BASENAME = dw
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/dx/Makefile
+++ b/src/osgPlugins/dx/Makefile
@@ -9,6 +9,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_dx.$(PLUGIN_EXT)
+TARGET_BASENAME = dx
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/flt/Makefile
+++ b/src/osgPlugins/flt/Makefile
@@ -47,6 +47,7 @@ INC += -I$(THISDIR)

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_flt.$(PLUGIN_EXT)
+TARGET_BASENAME = flt
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/gif/Makefile
+++ b/src/osgPlugins/gif/Makefile
@@ -12,6 +12,7 @@ LINKARGS += -L/usr/freeware/lib$(ARCH)

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_gif.$(PLUGIN_EXT)
+TARGET_BASENAME = gif
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/jpeg/Makefile
+++ b/src/osgPlugins/jpeg/Makefile
@@ -8,6 +8,7 @@ INC += -I/usr/local/include/

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_jpeg.$(PLUGIN_EXT)
+TARGET_BASENAME = jpeg
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/lib3ds/Makefile
+++ b/src/osgPlugins/lib3ds/Makefile
@@ -28,6 +28,7 @@ INC += -I$(THISDIR)

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_3ds.$(PLUGIN_EXT)
+TARGET_BASENAME = 3ds
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/lwo/Makefile
+++ b/src/osgPlugins/lwo/Makefile
@@ -10,6 +10,7 @@ INC += -I$(THISDIR)

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_lwo.$(PLUGIN_EXT)
+TARGET_BASENAME = lwo
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/obj/Makefile
+++ b/src/osgPlugins/obj/Makefile
@@ -10,6 +10,7 @@ INC += -I$(THISDIR)

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_obj.$(PLUGIN_EXT)
+TARGET_BASENAME = obj
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/osg/Makefile
+++ b/src/osgPlugins/osg/Makefile
@@ -45,6 +45,7 @@ CXXFILES =\

 LIBS   += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_osg.$(PLUGIN_EXT)
+TARGET_BASENAME = osg
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/osgtgz/Makefile
+++ b/src/osgPlugins/osgtgz/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_osgtgz.$(PLUGIN_EXT)
+TARGET_BASENAME = osgtgz
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/pfb/Makefile
+++ b/src/osgPlugins/pfb/Makefile
@@ -8,6 +8,7 @@ CXXFILES =\

 LIBS   += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_pfb.$(PLUGIN_EXT)
+TARGET_BASENAME = pfb
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/pic/Makefile
+++ b/src/osgPlugins/pic/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_pic.$(PLUGIN_EXT)
+TARGET_BASENAME = pic
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/png/Makefile
+++ b/src/osgPlugins/png/Makefile
@@ -10,6 +10,7 @@ INC  += -I/usr/local/include\

 LINKARGS += -L/usr/freeware/lib$(ARCH)

-PLUGIN = osgdb_png.$(PLUGIN_EXT)
+TARGET_BASENAME = png
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/quicktime/Makefile
+++ b/src/osgPlugins/quicktime/Makefile
@@ -7,7 +7,8 @@ CXXFILES =\

 LIBS  += $(QUICKTIME) $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_qt.$(PLUGIN_EXT)
+TARGET_BASENAME = qt
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 

--- a/src/osgPlugins/rgb/Makefile
+++ b/src/osgPlugins/rgb/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_rgb.$(PLUGIN_EXT)
+TARGET_BASENAME = rgb
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tga/Makefile
+++ b/src/osgPlugins/tga/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_tga.$(PLUGIN_EXT)
+TARGET_BASENAME = tga
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tgz/Makefile
+++ b/src/osgPlugins/tgz/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_tgz.$(PLUGIN_EXT)
+TARGET_BASENAME = tgz
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tiff/Makefile
+++ b/src/osgPlugins/tiff/Makefile
@@ -9,6 +9,7 @@ LIBS  += $(TIFF_LIB) $(OSG_LIBS) $(OTHER_LIBS)
 INC     += -I/usr/local/include
 LDFLAGS += -L/usr/local/lib

-PLUGIN = osgdb_tiff.$(PLUGIN_EXT)
+TARGET_BASENAME = tiff
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/txp/Makefile
+++ b/src/osgPlugins/txp/Makefile
@@ -30,6 +30,7 @@ INC += -I$(THISDIR)

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_txp.$(PLUGIN_EXT)
+TARGET_BASENAME = txp
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/zip/Makefile
+++ b/src/osgPlugins/zip/Makefile
@@ -6,6 +6,7 @@ CXXFILES =\

 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

-PLUGIN = osgdb_zip.$(PLUGIN_EXT)
+TARGET_BASENAME = zip
+PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgText/Makefile
+++ b/src/osgText/Makefile
@@ -38,6 +38,7 @@ DEF += -DOSGTEXT_LIBRARY
 LINKARGS += -L/usr/local/lib\
 	    -L/usr/freeware/lib$(ARCH)

-LIB = libosgText.$(SO_EXT)
+TARGET_BASENAME = osgText
+LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgUtil/Makefile
+++ b/src/osgUtil/Makefile
@@ -37,6 +37,7 @@ DEF     += -DOSGUTIL_LIBRARY

 LIBS  += -losg $(GL_LIBS) $(OTHER_LIBS)

-LIB = libosgUtil.$(SO_EXT)
+TARGET_BASENAME = osgUtil
+LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgUtil/RenderStage.cpp
+++ b/src/osgUtil/RenderStage.cpp
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <osg/Notify>

 #include <osgUtil/RenderStage>