From 75fe0a6a7f8480637e1c494f6de2fadb7564e5f2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 3 Jan 2002 23:19:18 +0000 Subject: [PATCH] Makefile changes to support Cywin port - submission from Norman Vine, updates to fix case problems under unix by Robert. --- Makefile | 23 +++++++++++---- src/Demos/Makefile | 7 +++-- src/Demos/hangglide/Makefile | 18 ++++++------ src/Demos/osgcluster/Makefile | 12 ++++---- src/Demos/osgconv/Makefile | 12 ++++---- src/Demos/osgcube/Makefile | 12 ++++---- src/Demos/osgimpostor/Makefile | 12 ++++---- src/Demos/osgreflect/Makefile | 12 ++++---- src/Demos/osgtext/Makefile | 12 ++++---- src/Demos/osgtexture/Makefile | 12 ++++---- src/Demos/osgviews/Makefile | 12 ++++---- src/Demos/sgv/Makefile | 12 ++++---- src/Demos/wxsgv/Makefile | 14 ++++----- src/Makefile | 2 +- src/osg/Makefile | 40 +++++++++++++------------ src/osgDB/Makefile | 32 ++++++++++---------- src/osgGLUT/Makefile | 14 ++++----- src/osgPlugins/Makefile | 2 +- src/osgPlugins/bmp/Makefile | 17 ++++++----- src/osgPlugins/dw/Makefile | 19 +++++++----- src/osgPlugins/flt/Makefile | 17 +++++++---- src/osgPlugins/gif/Makefile | 4 +-- src/osgPlugins/jpeg/Makefile | 17 ++++++----- src/osgPlugins/lib3ds/Makefile | 19 +++++++----- src/osgPlugins/lwo/Makefile | 18 +++++++----- src/osgPlugins/obj/Makefile | 19 +++++++----- src/osgPlugins/osg/Makefile | 19 +++++++----- src/osgPlugins/osgtgz/Makefile | 16 ++++++---- src/osgPlugins/pfb/Makefile | 4 +-- src/osgPlugins/pic/Makefile | 18 +++++++----- src/osgPlugins/png/Makefile | 24 ++++++++------- src/osgPlugins/rgb/Makefile | 17 ++++++----- src/osgPlugins/tga/Makefile | 18 +++++++----- src/osgPlugins/tgz/Makefile | 15 ++++++---- src/osgPlugins/tiff/Makefile | 16 ++++++---- src/osgPlugins/zip/Makefile | 13 +++++---- src/osgText/Makefile | 53 +++++++++++++++++----------------- src/osgUtil/Makefile | 40 +++++++++++++------------ src/osgWX/Makefile | 16 +++++----- 39 files changed, 374 insertions(+), 285 deletions(-) diff --git a/Makefile b/Makefile index ffbb6839c..46b754e5d 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ DIRS = src VERSION = osg-0.8.43 +export TOP := $(shell pwd) + all : $(MAKE_PREP) for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done @@ -20,6 +22,8 @@ Make/makedefs : ln -sf makedefs.irix.std makedefs ;;\ Linux) \ ln -sf makedefs.linux makedefs;;\ + CYGWIN*) \ + ln -sf makedefs.cyg makedefs;;\ esac Make/makerules : @@ -29,6 +33,8 @@ Make/makerules : ln -sf makerules.irix makerules ;; \ Linux) \ ln -sf makerules.linux makerules ;;\ + CYGWIN*) \ + ln -sf makerules.cyg makerules ;;\ esac linux: @@ -37,6 +43,12 @@ linux: ln -sf makerules.linux makerules $(MAKE) +cygwin: + cd Make;\ + ln -sf makedefs.cyg makedefs;\ + ln -sf makerules.cyg makerules + $(MAKE) + freebsd: cd Make;\ ln -sf makedefs.freebsd makedefs;\ @@ -67,6 +79,7 @@ help : @echo Usage : @echo \ $(MAKE) @echo \ $(MAKE) linux + @echo \ $(MAKE) cygwin @echo \ $(MAKE) irix @echo \ $(MAKE) irix.old @echo \ $(MAKE) depend @@ -124,11 +137,11 @@ instcheck : diff -q include/osgDB/ /usr/include/osgDB/ diff -q include/osgText/ /usr/include/osgText/ diff -q include/osgGLUT/ /usr/include/osgGLUT/ - diff -q lib/libosg.so /usr/lib/libosg.so - diff -q lib/libosgUtil.so /usr/lib/libosgUtil.so - diff -q lib/libosgDB.so /usr/lib/libosgDB.so - diff -q lib/libosgGLUT.so /usr/lib/libosgGLUT.so - diff -q lib/libosgText.so /usr/lib/libosgText.so + diff -q lib/libosg.$(SO_EXT) /usr/lib/libosg.$(SO_EXT) + diff -q lib/libosgUtil.$(SO_EXT) /usr/lib/libosgUtil.$(SO_EXT) + diff -q lib/libosgDB.$(SO_EXT) /usr/lib/libosgDB.$(SO_EXT) + diff -q lib/libosgGLUT.$(SO_EXT) /usr/lib/libosgGLUT.$(SO_EXT) + diff -q lib/libosgText.$(SO_EXT) /usr/lib/libosgText.$(SO_EXT) diff -q lib/osgPlugins/ /usr/lib/osgPlugins/ stats : diff --git a/src/Demos/Makefile b/src/Demos/Makefile index 6fca9987b..874ab474c 100644 --- a/src/Demos/Makefile +++ b/src/Demos/Makefile @@ -1,10 +1,13 @@ #!smake SHELL=/bin/sh -DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide osgcluster +DIRS = sgv osgconv osgcube osgreflect osgtexture osgimpostor osgviews hangglide + +# comment out if you don't have +#DIRS += osgcluster # comment out if you don't have the freetype and GLU1.3 library installed. -DIRS += osgtext +#DIRS += osgtext # comment out if you don't have the wxWindows installed. # DIRS += wxsgv diff --git a/src/Demos/hangglide/Makefile b/src/Demos/hangglide/Makefile index 2c11e1cdc..516c09dbc 100644 --- a/src/Demos/hangglide/Makefile +++ b/src/Demos/hangglide/Makefile @@ -1,18 +1,18 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ hangglide.cpp\ ReaderWriterFLY.cpp\ - GliderManipulator.cpp\ - hat.cpp\ + GliderManipulator.cpp\ + hat.cpp\ terrain.cpp\ tank.cpp\ sky.cpp\ base.cpp\ trees.cpp\ -TARGET = ../../../bin/hangglide +TARGET = $(TOP)/bin/hangglide TARGET_BIN_FILES = hangglide @@ -20,9 +20,9 @@ TARGET_BIN_FILES = hangglide #LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) +# $(OSGDB_LIBS) +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib - -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgcluster/Makefile b/src/Demos/osgcluster/Makefile index 0236fafff..17f401bc1 100644 --- a/src/Demos/osgcluster/Makefile +++ b/src/Demos/osgcluster/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ broadcaster.cpp\ @@ -8,7 +8,7 @@ C++FILES = \ C++FLAGS += -g -TARGET = ../../../bin/osgcluster +TARGET = $(TOP)/bin/osgcluster TARGET_BIN_FILES = osgcluster @@ -16,10 +16,10 @@ TARGET_BIN_FILES = osgcluster #LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgconv/Makefile b/src/Demos/osgconv/Makefile index 0978e5839..216c8cc8f 100644 --- a/src/Demos/osgconv/Makefile +++ b/src/Demos/osgconv/Makefile @@ -1,12 +1,12 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ osgconv.cpp\ OrientationConverter.cpp -TARGET = ../../../bin/osgconv +TARGET = $(TOP)/bin/osgconv TARGET_BIN_FILES = osgconv @@ -14,9 +14,9 @@ TARGET_BIN_FILES = osgconv #LIBS = ${PFLIBS} -losgDB -losg -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgDB -losg -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgDB -losg $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgcube/Makefile b/src/Demos/osgcube/Makefile index 362211f93..9dc6634cc 100644 --- a/src/Demos/osgcube/Makefile +++ b/src/Demos/osgcube/Makefile @@ -1,15 +1,15 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ osgcube.cpp -TARGET = ../../../bin/osgcube +TARGET = $(TOP)/bin/osgcube TARGET_BIN_FILES = osgcube -LIBS = -losgGLUT -losgDB -losgUtil -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +LIBS = -losgGLUT -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgimpostor/Makefile b/src/Demos/osgimpostor/Makefile index e01b550e1..e01ea6339 100644 --- a/src/Demos/osgimpostor/Makefile +++ b/src/Demos/osgimpostor/Makefile @@ -1,10 +1,10 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ osgimpostor.cpp -TARGET = ../../../bin/osgimpostor +TARGET = $(TOP)/bin/osgimpostor TARGET_BIN_FILES = osgimpostor @@ -12,10 +12,10 @@ TARGET_BIN_FILES = osgimpostor #LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgreflect/Makefile b/src/Demos/osgreflect/Makefile index 87fc9124f..ee0b63e7e 100644 --- a/src/Demos/osgreflect/Makefile +++ b/src/Demos/osgreflect/Makefile @@ -1,10 +1,10 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ osgreflect.cpp \ -TARGET = ../../../bin/osgreflect +TARGET = $(TOP)/bin/osgreflect TARGET_BIN_FILES = osgreflect @@ -12,9 +12,9 @@ TARGET_BIN_FILES = osgreflect #LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgtext/Makefile b/src/Demos/osgtext/Makefile index 809d3f606..8b8d37fea 100644 --- a/src/Demos/osgtext/Makefile +++ b/src/Demos/osgtext/Makefile @@ -1,10 +1,10 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ main.cpp -TARGET = ../../../bin/osgtext +TARGET = $(TOP)/bin/osgtext TARGET_BIN_FILES = osgtext @@ -12,10 +12,10 @@ TARGET_BIN_FILES = osgtext #LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgGLUT -losgText -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgText -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -g -LDFLAGS += -L../../../lib -L/usr/freeware/lib32 +C++FLAGS += -I$(TOP)/include -g +LDFLAGS += -L$(TOP)/lib -L/usr/freeware/lib32 -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgtexture/Makefile b/src/Demos/osgtexture/Makefile index 30125a817..89f21f369 100644 --- a/src/Demos/osgtexture/Makefile +++ b/src/Demos/osgtexture/Makefile @@ -1,10 +1,10 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ osgtexture.cpp -TARGET = ../../../bin/osgtexture +TARGET = $(TOP)/bin/osgtexture TARGET_BIN_FILES = osgtexture @@ -12,9 +12,9 @@ TARGET_BIN_FILES = osgtexture #LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/osgviews/Makefile b/src/Demos/osgviews/Makefile index 30f39d047..294a0361d 100644 --- a/src/Demos/osgviews/Makefile +++ b/src/Demos/osgviews/Makefile @@ -1,10 +1,10 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ osgviews.cpp -TARGET = ../../../bin/osgviews +TARGET = $(TOP)/bin/osgviews TARGET_BIN_FILES = osgviews @@ -12,10 +12,10 @@ TARGET_BIN_FILES = osgviews #LIBS = ${PFLIBS} -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi #note, standard library list. -LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/sgv/Makefile b/src/Demos/sgv/Makefile index 561ab27f7..006be087a 100644 --- a/src/Demos/sgv/Makefile +++ b/src/Demos/sgv/Makefile @@ -1,18 +1,18 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ sgv.cpp -TARGET = ../../../bin/sgv +TARGET = $(TOP)/bin/sgv TARGET_BIN_FILES = sgv #note, standard library list. -LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) -lGLU -lGL -lm -lXmu -lX11 -lXi +LIBS = -losgGLUT -losgUtil -losgDB -losg $(GLUTLIB) $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Demos/wxsgv/Makefile b/src/Demos/wxsgv/Makefile index 7074dcfd0..12ba2ec01 100644 --- a/src/Demos/wxsgv/Makefile +++ b/src/Demos/wxsgv/Makefile @@ -1,14 +1,14 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ $(wildcard *.cpp) -TARGET = ../../../bin/wxsgv +TARGET = $(TOP)/bin/wxsgv TARGET_BIN_FILES = wxsgv -C++FLAGS += -I../../include `wx-config --cflags` +C++FLAGS += -I$(TOP)/include `wx-config --cflags` #note, use this library list when using the Performer osgPlugin. #LIBS = ${PFLIBS} -losgWX -losgUtil -losgDB -losg \ @@ -18,10 +18,10 @@ C++FLAGS += -I../../include `wx-config --cflags` #note, standard library list. LIBS = -losgWX -losgUtil -losgDB -losg \ `wx-config --libs` -lwx_gtk_gl \ - -lGLU -lGL -lm -lXmu -lX11 -lXi + $(GL_LIBS) $(X_LIBS) -C++FLAGS += -I../../../include -I./icons -LDFLAGS += -L../../../lib +C++FLAGS += -I$(TOP)/include -I./icons +LDFLAGS += -L$(TOP)/lib -include ../../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/Makefile b/src/Makefile index f2a403de6..291140a9b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ SHELL=/bin/sh DIRS = osg osgDB osgUtil osgGLUT # comment out if you don't have the freetype and GLU1.3 library installed. -DIRS += osgText +#DIRS += osgText # comment out if you don't have the wxWindows installed. # DIRS += osgWX diff --git a/src/osg/Makefile b/src/osg/Makefile index e1bbeef3d..b3b5bc24b 100644 --- a/src/osg/Makefile +++ b/src/osg/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ AlphaFunc.cpp\ @@ -12,7 +12,7 @@ C++FILES = \ ColorMatrix.cpp \ CullFace.cpp\ Depth.cpp \ - DisplaySettings.cpp\ + DisplaySettings.cpp\ Drawable.cpp\ EarthSky.cpp\ Fog.cpp\ @@ -21,27 +21,27 @@ C++FILES = \ Geode.cpp\ GeoSet.cpp\ GeoSet_ogl.cpp\ - GLExtensions.cpp\ + GLExtensions.cpp\ Group.cpp\ Image.cpp\ Impostor.cpp\ ImpostorSprite.cpp\ Light.cpp\ LightSource.cpp\ - LineSegment.cpp\ - LineWidth.cpp\ + LineSegment.cpp\ + LineWidth.cpp\ LOD.cpp\ Material.cpp\ Matrix.cpp\ Node.cpp\ NodeCallback.cpp\ NodeVisitor.cpp\ - Notify.cpp\ + Notify.cpp\ Object.cpp\ - Point.cpp\ + Point.cpp\ PolygonMode.cpp\ - PolygonOffset.cpp\ - Quat.cpp\ + PolygonOffset.cpp\ + Quat.cpp\ State.cpp\ StateSet.cpp\ Stencil.cpp \ @@ -53,15 +53,16 @@ C++FILES = \ Timer.cpp\ Transform.cpp\ Transparency.cpp\ - Version.cpp\ - Viewport.cpp\ + Version.cpp\ + Viewport.cpp\ TARGET_BASENAME = osg -TARGET_LIB_FILES = lib$(TARGET_BASENAME).so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) TARGET_INCLUDE_FILES = \ + osg/Notify\ osg/AlphaFunc\ osg/Billboard\ osg/BoundingBox\ @@ -74,7 +75,7 @@ TARGET_INCLUDE_FILES = \ osg/ColorMatrix\ osg/CullFace\ osg/Depth\ - osg/DisplaySettings\ + osg/DisplaySettings\ osg/Drawable\ osg/EarthSky\ osg/Export\ @@ -102,7 +103,6 @@ TARGET_INCLUDE_FILES = \ osg/Node\ osg/NodeCallback\ osg/NodeVisitor\ - osg/Notify\ osg/Object\ osg/Point\ osg/PolygonMode\ @@ -133,12 +133,14 @@ TARGET_INCLUDE_FILES = \ osg/ref_ptr\ -LIBS = -lGLU -lGL -lm +LIBS = $(GL_LIBS) -LIB = ../../lib/lib$(TARGET_BASENAME).so -#LIB = ../../lib/lib$(TARGET_BASENAME).a +LIB = $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT) +#LIB = $(TOP)/lib/lib$(TARGET_BASENAME).a -C++FLAGS += -I ../../include +C++FLAGS += -I $(TOP)/include -DSG_LIBRARY -include ../../Make/makerules +#LDFLAGS += -Wl,--out-implib,./../lib/lib$(TARGET_BASENAME).a + +include $(TOP)/Make/makerules diff --git a/src/osgDB/Makefile b/src/osgDB/Makefile index 2f36b5ee8..c1f58570a 100644 --- a/src/osgDB/Makefile +++ b/src/osgDB/Makefile @@ -1,13 +1,13 @@ #!smake -include ../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ - DynamicLibrary.cpp\ - FileNameUtils.cpp\ + DynamicLibrary.cpp\ + FileNameUtils.cpp\ FileUtils.cpp\ ReadFile.cpp\ - Registry.cpp\ - Version.cpp\ + Registry.cpp\ + Version.cpp\ WriteFile.cpp\ Input.cpp\ Output.cpp\ @@ -19,18 +19,18 @@ C++FILES = \ TARGET_BASENAME = osgDB -TARGET_LIB_FILES = lib$(TARGET_BASENAME).so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) TARGET_INCLUDE_FILES = \ + osgDB/Registry\ osgDB/DynamicLibrary\ osgDB/Export\ osgDB/FileNameUtils\ osgDB/FileUtils\ osgDB/ReaderWriter\ - osgDB/ReadFile\ - osgDB/Registry\ + osgDB/ReadFile\ osgDB/Version\ - osgDB/WriteFile\ + osgDB/WriteFile\ osgDB/Input\ osgDB/Output\ osgDB/Field\ @@ -39,13 +39,15 @@ TARGET_INCLUDE_FILES = \ osgDB/DotOsgWrapper\ -#LIBS = -L../../lib -losg -lGLU -lGL -lm -ldl -LIBS = -L../../lib -losg -lGLU -lGL -lm $(DYNAMICLIBRARYLIB) +#LIBS = -L$(TOP)/lib -losg -lGLU -lGL -lm -ldl +LIBS = -L$(TOP)/lib -losg $(GL_LIBS) $(DYNAMICLIBRARYLIB) -LIB = ../../lib/lib$(TARGET_BASENAME).so -#LIB = ../../lib/lib$(TARGET_BASENAME).a +LIB = $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT) +#LIB = $(TOP)/lib/lib$(TARGET_BASENAME).a -C++FLAGS += -I ../../include +C++FLAGS += -I $(TOP)/include -DOSGDB_LIBRARY -include ../../Make/makerules +#LDFLAGS += -Wl,--out-implib,./../lib/lib$(TARGET_BASENAME).a + +include $(TOP)/Make/makerules diff --git a/src/osgGLUT/Makefile b/src/osgGLUT/Makefile index 156bb3d27..198e156e7 100644 --- a/src/osgGLUT/Makefile +++ b/src/osgGLUT/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ GLUTEventAdapter.cpp\ @@ -10,12 +10,12 @@ C++FILES = \ TARGET_BASENAME = osgGLUT -LIBS = -L../../lib -losgDB -losgUtil -losg $(GLUTLIB) -lGLU -lGL -lm +LIBS = -L$(TOP)/lib -losgDB -losgUtil -losg $(GLUTLIB) $(GL_LIBS) -LIB = ../../lib/lib$(TARGET_BASENAME).so -#LIB = ../../lib/lib$(TARGET_BASENAME).a +LIB = $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT) +#LIB = $(TOP)/lib/lib$(TARGET_BASENAME).a -TARGET_LIB_FILES = lib$(TARGET_BASENAME).so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) TARGET_INCLUDE_FILES = \ osgGLUT/Export\ osgGLUT/GLUTEventAdapter\ @@ -25,7 +25,7 @@ TARGET_INCLUDE_FILES = \ osgGLUT/glut\ -C++FLAGS += -I ../../include +C++FLAGS += -I $(TOP)/include -DOSGGLUT_LIBRARY -include ../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/Makefile b/src/osgPlugins/Makefile index 11de06b67..27dfccf81 100644 --- a/src/osgPlugins/Makefile +++ b/src/osgPlugins/Makefile @@ -13,7 +13,7 @@ DIRS += png DIRS += jpeg # comment in if you have libungif installed. -DIRS += gif +#DIRS += gif # comment in if you have libtiff installed. DIRS += tiff diff --git a/src/osgPlugins/bmp/Makefile b/src/osgPlugins/bmp/Makefile index 7a28e79c7..5096562c4 100644 --- a/src/osgPlugins/bmp/Makefile +++ b/src/osgPlugins/bmp/Makefile @@ -1,18 +1,21 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterBMP.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_bmp.so +TARGET_BASENAME = osgdb_bmp -TARGET_LOADER_FILES = osgPlugins/osgdb_bmp.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIBS = -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIBS = $(GL_LIBS) -losg -losgDB +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/Makefile index 06bcbfa40..d26459924 100644 --- a/src/osgPlugins/dw/Makefile +++ b/src/osgPlugins/dw/Makefile @@ -1,15 +1,20 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = ReaderWriterDW.cpp -LIB = ../../../lib/osgPlugins/osgdb_dw.so +TARGET_BASENAME = osgdb_dw -TARGET_LOADER_FILES = osgPlugins/osgdb_dw.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIBS = -losg -losgDB +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -C++FLAGS += -I. -I../../../include -DGLU_VERSION_1_2 -LDFLAGS += -L../../../lib +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) + +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules -include ../../../Make/makerules diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/Makefile index e5d9bcf27..0d8153381 100644 --- a/src/osgPlugins/flt/Makefile +++ b/src/osgPlugins/flt/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ BoundingVolumeRecords.cpp\ @@ -43,12 +43,19 @@ C++FILES = \ -C++FLAGS += -I../../../include +TARGET_BASENAME = osgdb_flt -LIB = ../../../lib/osgPlugins/osgdb_flt.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -TARGET_LOADER_FILES = osgPlugins/osgdb_flt.so +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include + +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile index a154b0f12..d804c71b9 100644 --- a/src/osgPlugins/gif/Makefile +++ b/src/osgPlugins/gif/Makefile @@ -4,9 +4,9 @@ include ../../../Make/makedefs C++FILES = \ ReaderWriterGIF.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_gif.so +LIB = ../../../lib/osgPlugins/osgdb_gif.$(SO_EXT) -TARGET_LOADER_FILES = osgPlugins/osgdb_gif.so +TARGET_LOADER_FILES = osgPlugins/osgdb_gif.$(SO_EXT) LIBS = -lungif diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/Makefile index 736afff13..5666c3f7c 100644 --- a/src/osgPlugins/jpeg/Makefile +++ b/src/osgPlugins/jpeg/Makefile @@ -1,18 +1,21 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterJPEG.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_jpeg.so -TARGET_LOADER_FILES = osgPlugins/osgdb_jpeg.so +TARGET_BASENAME = osgdb_jpg -LIBS = -ljpeg -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib $(FREEBSD_LOCALLIBS) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIBS = $(GL_LIBS) -losg -losgDB -ljpeg +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/Makefile index 19051523f..4affe255a 100644 --- a/src/osgPlugins/lib3ds/Makefile +++ b/src/osgPlugins/lib3ds/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ atmosphere.cpp \ @@ -23,15 +23,20 @@ C++FILES = \ vector.cpp \ ReaderWriter3DS.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_3ds.so +TARGET_BASENAME = osgdb_3ds -TARGET_LOADER_FILES = osgPlugins/osgdb_3ds.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIBS = -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) + +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/Makefile index 751eb1aad..7416c7efb 100644 --- a/src/osgPlugins/lwo/Makefile +++ b/src/osgPlugins/lwo/Makefile @@ -1,15 +1,19 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = ReaderWriterLWO.cpp lw.cpp -LIB = ../../../lib/osgPlugins/osgdb_lwo.so +TARGET_BASENAME = osgdb_lwo -TARGET_LOADER_FILES = osgPlugins/osgdb_lwo.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIBS = -losg -losgDB -losgUtil +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIBS = $(GL_LIBS) -losg -losgDB -losgUtil + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/Makefile index da7e28f45..5ac244145 100644 --- a/src/osgPlugins/obj/Makefile +++ b/src/osgPlugins/obj/Makefile @@ -1,14 +1,19 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = ReaderWriterOBJ.cpp glm.cpp -LIB = ../../../lib/osgPlugins/osgdb_obj.so +TARGET_BASENAME = osgdb_obj -TARGET_LOADER_FILES = osgPlugins/osgdb_obj.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIBS = -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) + +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile index 5c28d15bb..c8cd1046b 100644 --- a/src/osgPlugins/osg/Makefile +++ b/src/osgPlugins/osg/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ AlphaFunc.cpp\ @@ -40,15 +40,20 @@ C++FILES = \ Transform.cpp\ Transparency.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_osg.so +TARGET_BASENAME = osgdb_osg -TARGET_LOADER_FILES = osgPlugins/osgdb_osg.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIBS = -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) + +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/Makefile index b801c51eb..1c2f350fc 100644 --- a/src/osgPlugins/osgtgz/Makefile +++ b/src/osgPlugins/osgtgz/Makefile @@ -1,18 +1,22 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterOSGTGZ.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_osgtgz.so +TARGET_BASENAME = osgdb_osgtgz -TARGET_LOADER_FILES = osgPlugins/osgdb_osgtgz.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIBS = $(GL_LIBS) -losg -losgDB +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile index fd422d8b6..4fc9e6a57 100644 --- a/src/osgPlugins/pfb/Makefile +++ b/src/osgPlugins/pfb/Makefile @@ -9,7 +9,7 @@ C++FILES = \ ConvertToPerformer.cpp\ ReaderWriterPFB.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_pfb.so +LIB = ../../../lib/osgPlugins/osgdb_pfb.$(SO_EXT) LIBS = -losg -losgDB \ -lpf3ds\ @@ -41,7 +41,7 @@ LIBS = -losg -losgDB \ -lpfvct\ -lpfdu -lpfutil -lpf -TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.so +TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.$(SO_EXT) C++FLAGS += -g -I../../../include diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/Makefile index 314a820ee..6f76606a2 100644 --- a/src/osgPlugins/pic/Makefile +++ b/src/osgPlugins/pic/Makefile @@ -1,18 +1,22 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterPIC.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_pic.so -TARGET_LOADER_FILES = osgPlugins/osgdb_pic.so +TARGET_BASENAME = osgdb_pic -LIBS = -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile index 49fb82519..6a8e27954 100644 --- a/src/osgPlugins/png/Makefile +++ b/src/osgPlugins/png/Makefile @@ -1,18 +1,22 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterPNG.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_png.so - -TARGET_LOADER_FILES = osgPlugins/osgdb_png.so - -LIBS = -lpng -C++FLAGS += -I../../../include -I/usr/local/include -I/usr/freeware/include -LDFLAGS += -L../../../lib -L/usr/local/lib -L/usr/freeware/lib32 - -include ../../../Make/makerules +TARGET_BASENAME = osgdb_png +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) + +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) + +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) + +LIBS = $(GL_LIBS) -losg -losgDB -lpng + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/Makefile index 5f6cd06d6..13bfa7382 100644 --- a/src/osgPlugins/rgb/Makefile +++ b/src/osgPlugins/rgb/Makefile @@ -1,18 +1,21 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterRGB.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_rgb.so +TARGET_BASENAME = osgdb_rgb -TARGET_LOADER_FILES = osgPlugins/osgdb_rgb.so +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -LIBS = -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/Makefile index fb3f6d2ac..8c26a2718 100644 --- a/src/osgPlugins/tga/Makefile +++ b/src/osgPlugins/tga/Makefile @@ -1,18 +1,22 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterTGA.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_tga.so -TARGET_LOADER_FILES = osgPlugins/osgdb_tga.so +TARGET_BASENAME = osgdb_tga -LIBS = -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIBS = $(GL_LIBS) -losg -losgDB + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/Makefile index 8e1f00ccb..75a1310c3 100644 --- a/src/osgPlugins/tgz/Makefile +++ b/src/osgPlugins/tgz/Makefile @@ -1,18 +1,21 @@ #!smake -include ../../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ ReaderWriterTGZ.cpp\ +TARGET_BASENAME = osgdb_tgz -LIB = ../../../lib/osgPlugins/osgdb_tgz.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -TARGET_LOADER_FILES = osgPlugins/osgdb_tgz.so +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIBS = $(GL_LIBS) -losg -losgDB +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile index e75645526..a9c5d1594 100644 --- a/src/osgPlugins/tiff/Makefile +++ b/src/osgPlugins/tiff/Makefile @@ -4,15 +4,19 @@ include ../../../Make/makedefs C++FILES = \ ReaderWriterTIFF.cpp\ -LIB = ../../../lib/osgPlugins/osgdb_tiff.so -TARGET_LOADER_FILES = osgPlugins/osgdb_tiff.so +TARGET_BASENAME = osgdb_tiff -LIBS = -ltiff -C++FLAGS += -I. -I../../../include -LDFLAGS += -L../../../lib $(FREEBSD_LOCALLIBS) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIBS = $(GL_LIBS) -losg -losgDB -ltiff + +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib + +include $(TOP)/Make/makerules diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/Makefile index d3a77d1e3..20c357e08 100644 --- a/src/osgPlugins/zip/Makefile +++ b/src/osgPlugins/zip/Makefile @@ -4,15 +4,18 @@ include ../../../Make/makedefs C++FILES = \ ReaderWriterZIP.cpp\ +TARGET_BASENAME = osgdb_zip -LIB = ../../../lib/osgPlugins/osgdb_zip.so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -TARGET_LOADER_FILES = osgPlugins/osgdb_zip.so +LIB = $(TOP)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -C++FLAGS += -I../../../include -LDFLAGS += -L../../../lib +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) -include ../../../Make/makerules +LIBS = $(GL_LIBS) -losg -losgDB +C++FLAGS += -I. -I$(TOP)/include +LDFLAGS += -L$(TOP)/lib +include $(TOP)/Make/makerules diff --git a/src/osgText/Makefile b/src/osgText/Makefile index cad599b9e..2b53c4e85 100644 --- a/src/osgText/Makefile +++ b/src/osgText/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ FTBitmapGlyph.cpp \ @@ -7,34 +7,34 @@ C++FILES = \ FTFace.cpp \ FTFont.cpp \ FTGLBitmapFont.cpp \ - FTGLOutlineFont.cpp \ - FTGLPixmapFont.cpp \ - FTGLPolygonFont.cpp \ - FTGLTextureFont.cpp \ - FTGlyphContainer.cpp \ - FTGlyph.cpp \ - FTLibrary.cpp \ - FTOutlineGlyph.cpp \ - FTPixmapGlyph.cpp \ - FTPolyGlyph.cpp \ - FTSize.cpp \ - FTTextureGlyph.cpp \ - FTVectoriser.cpp \ - Font.cpp \ - Paragraph.cpp \ - Text.cpp \ - Version.cpp + FTGLOutlineFont.cpp \ + FTGLPixmapFont.cpp \ + FTGLPolygonFont.cpp \ + FTGLTextureFont.cpp \ + FTGlyphContainer.cpp \ + FTGlyph.cpp \ + FTLibrary.cpp \ + FTOutlineGlyph.cpp \ + FTPixmapGlyph.cpp \ + FTPolyGlyph.cpp \ + FTSize.cpp \ + FTTextureGlyph.cpp \ + FTVectoriser.cpp \ + Font.cpp \ + Paragraph.cpp \ + Text.cpp \ + Version.cpp TARGET_BASENAME = osgText -LIBS = -L../../lib -lfreetype -losgDB -losg -lGLU -lGL -lm +LIBS = -L$(TOP)/lib -lfreetype -losgDB -losg $(GL_LIBS) -LIB = ../../lib/lib$(TARGET_BASENAME).so -#LIB = ../../lib/lib$(TARGET_BASENAME).a +LIB = $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT) +#LIB = $(TOP)/lib/lib$(TARGET_BASENAME).a -TARGET_LIB_FILES = lib$(TARGET_BASENAME).so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) TARGET_INCLUDE_FILES = \ osgText/Export\ osgText/Font\ @@ -42,14 +42,15 @@ TARGET_INCLUDE_FILES = \ osgText/Text\ osgText/Version -C++FLAGS += -I../../include \ +C++FLAGS += -I$(TOP)/include \ -I/usr/include/freetype2 \ -I/usr/local/include \ -I/usr/local/include/freetype2 \ - -I/usr/freeware/include\ - -I/usr/freeware/include/freetype2 + -I/usr/freeware/include \ + -I/usr/freeware/include/freetype2 \ + -DOSGTEXT_LIBRARY LDFLAGS += -L/usr/local/lib -L/usr/freeware/lib32 -include ../../Make/makerules +include $(TOP)/Make/makerules diff --git a/src/osgUtil/Makefile b/src/osgUtil/Makefile index 552404662..4eff37847 100644 --- a/src/osgUtil/Makefile +++ b/src/osgUtil/Makefile @@ -1,5 +1,5 @@ #!smake -include ../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ AppVisitor.cpp\ @@ -12,7 +12,7 @@ C++FILES = \ DriveManipulator.cpp\ FlightManipulator.cpp\ IntersectVisitor.cpp\ - InsertImpostorsVisitor.cpp\ + InsertImpostorsVisitor.cpp\ NvTriStripObjects.cpp\ Optimizer.cpp\ RenderBin.cpp\ @@ -22,25 +22,25 @@ C++FILES = \ RenderStageLighting.cpp\ RenderToTextureStage.cpp\ SceneView.cpp\ - SceneViewManipulator.cpp\ - SmoothingVisitor.cpp\ - StateSetManipulator.cpp\ - Tesselator.cpp\ - TrackballManipulator.cpp\ - TransformCallback.cpp\ - TriStripVisitor.cpp\ - Version.cpp\ + SceneViewManipulator.cpp\ + SmoothingVisitor.cpp\ + StateSetManipulator.cpp\ + Tesselator.cpp\ + TrackballManipulator.cpp\ + TransformCallback.cpp\ + TriStripVisitor.cpp\ + Version.cpp\ TARGET_BASENAME = osgUtil -LIBS = -L../../lib -losg -lGLU -lGL -lm +LIBS = -L$(TOP)/lib -losg $(GL_LIBS) -LIB = ../../lib/lib$(TARGET_BASENAME).so -#LIB = ../../lib/lib$(TARGET_BASENAME).a +LIB = $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT) +#LIB = $(TOP)/lib/lib$(TARGET_BASENAME).a -TARGET_LIB_FILES = lib$(TARGET_BASENAME).so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) TARGET_INCLUDE_FILES = \ osgUtil/AppVisitor\ osgUtil/CameraManipulator\ @@ -56,14 +56,14 @@ TARGET_INCLUDE_FILES = \ osgUtil/GUIEventAdapter\ osgUtil/GUIEventHandler\ osgUtil/IntersectVisitor\ - osgUtil/InsertImpostorsVisitor\ - osgUtil/Optimizer\ + osgUtil/InsertImpostorsVisitor\ + osgUtil/Optimizer\ osgUtil/RenderBin\ osgUtil/RenderGraph\ osgUtil/RenderLeaf\ osgUtil/RenderStage\ osgUtil/RenderStageLighting\ - osgUtil/RenderToTextureStage\ + osgUtil/RenderToTextureStage\ osgUtil/SceneView\ osgUtil/SceneViewManipulator\ osgUtil/SmoothingVisitor\ @@ -75,7 +75,9 @@ TARGET_INCLUDE_FILES = \ osgUtil/Version\ -C++FLAGS += -I ../../include +C++FLAGS += -I $(TOP)/include -DOSGUTIL_LIBRARY -include ../../Make/makerules +#LDFLAGS += --out-implib $(TOP)/lib/lib$(TARGET_BASENAME).a + +include $(TOP)/Make/makerules diff --git a/src/osgWX/Makefile b/src/osgWX/Makefile index 245922022..6b28e378c 100644 --- a/src/osgWX/Makefile +++ b/src/osgWX/Makefile @@ -1,24 +1,24 @@ #!smake -include ../../Make/makedefs +include $(TOP)/Make/makedefs C++FILES = \ WXEventAdapter.cpp\ - Version.cpp\ + Version.cpp\ TARGET_BASENAME = osgWX -LIBS = -L../../lib -losgDB -losgUtil -losg $(WXLIB) -lGLU -lGL -lm +LIBS = -L$(TOP)/lib -losgDB -losgUtil -losg $(WXLIB) $(GL_LIBS) -LIB = ../../lib/lib$(TARGET_BASENAME).so -#LIB = ../../lib/lib$(TARGET_BASENAME).a +LIB = $(TOP)/lib/lib$(TARGET_BASENAME).$(SO_EXT) +#LIB = $(TOP)/lib/lib$(TARGET_BASENAME).a -TARGET_LIB_FILES = lib$(TARGET_BASENAME).so +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) TARGET_INCLUDE_FILES = \ osgWX/Export\ osgWX/WXEventAdapter\ osgWX/Version\ -C++FLAGS += -I ../../include `wx-config --cflags` +C++FLAGS += -I $(TOP)/include `wx-config --cflags` -include ../../Make/makerules +include $(TOP)/Make/makerules