diff --git a/src/osgPlugins/bmp/Makefile b/src/osgPlugins/bmp/Makefile index f9a52f0a2..c28ab39cc 100644 --- a/src/osgPlugins/bmp/Makefile +++ b/src/osgPlugins/bmp/Makefile @@ -6,13 +6,15 @@ C++FILES = \ TARGET_BASENAME = osgdb_bmp -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LODABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/Makefile index 79e39f031..d43302d51 100644 --- a/src/osgPlugins/dw/Makefile +++ b/src/osgPlugins/dw/Makefile @@ -5,13 +5,15 @@ C++FILES = ReaderWriterDW.cpp TARGET_BASENAME = osgdb_dw -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/Makefile index d694340d2..93f0e6751 100644 --- a/src/osgPlugins/flt/Makefile +++ b/src/osgPlugins/flt/Makefile @@ -45,16 +45,17 @@ C++FILES = \ TARGET_BASENAME = osgdb_flt -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB = +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ -C++FLAGS += -I. -I$(OSGHOME)/include - +C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib include $(OSGHOME)/Make/makerules diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile index 4f672c656..6d099979c 100644 --- a/src/osgPlugins/gif/Makefile +++ b/src/osgPlugins/gif/Makefile @@ -4,11 +4,17 @@ include $(OSGHOME)/Make/makedefs C++FILES = \ ReaderWriterGIF.cpp\ -LIB = $(OSGHOME)/lib/osgPlugins/osgdb_gif.$(SO_EXT) +TARGET_BASENAME = osgdb_gif -TARGET_LOADER_FILES = osgPlugins/osgdb_gif.$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIBS = -lungif +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) + +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) + +LIBS = $(GL_LIBS) -losg -losgDB -lungif +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lungif -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include -I/usr/freeware/include LDFLAGS += -L$(OSGHOME)/lib $(FREEBSD_LOCALLIBS) -L/usr/freeware/lib32 diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/Makefile index 340c09dff..194efb7d5 100644 --- a/src/osgPlugins/lib3ds/Makefile +++ b/src/osgPlugins/lib3ds/Makefile @@ -27,11 +27,13 @@ TARGET_BASENAME = osgdb_3ds TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) +LIB= -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgUtil -losgDB -ldl -lm -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/Makefile index ce56fef9f..3ae766938 100644 --- a/src/osgPlugins/lwo/Makefile +++ b/src/osgPlugins/lwo/Makefile @@ -5,13 +5,15 @@ C++FILES = ReaderWriterLWO.cpp lw.cpp TARGET_BASENAME = osgdb_lwo -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) +LIB= -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB -losgUtil +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -losgUtil -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/Makefile index edc3e3f17..3139af111 100644 --- a/src/osgPlugins/obj/Makefile +++ b/src/osgPlugins/obj/Makefile @@ -5,13 +5,15 @@ C++FILES = ReaderWriterOBJ.cpp glm.cpp TARGET_BASENAME = osgdb_obj -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) +LIB= -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile index 90c2db6c4..55bc5f512 100644 --- a/src/osgPlugins/osg/Makefile +++ b/src/osgPlugins/osg/Makefile @@ -43,13 +43,16 @@ C++FILES = \ TARGET_BASENAME = osgdb_osg -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) +LIB= -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L../../../lib -losg -losgUtil -losgDB -ldl -lm -lstdc++ + C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/Makefile index ab4c3171c..38c613e0f 100644 --- a/src/osgPlugins/osgtgz/Makefile +++ b/src/osgPlugins/osgtgz/Makefile @@ -7,13 +7,15 @@ C++FILES = \ TARGET_BASENAME = osgdb_osgtgz -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/Makefile index 8944bba88..27ce87736 100644 --- a/src/osgPlugins/pic/Makefile +++ b/src/osgPlugins/pic/Makefile @@ -9,11 +9,13 @@ TARGET_BASENAME = osgdb_pic TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile index 59f1d0507..cb8436c54 100644 --- a/src/osgPlugins/png/Makefile +++ b/src/osgPlugins/png/Makefile @@ -8,13 +8,16 @@ C++FILES = \ TARGET_BASENAME = osgdb_png -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) + +LIBS = $(GL_LIBS) -losg -losgDB -lpng +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lpng -lstdc++ -LIBS = $(GL_LIBS) -losg -losgDB -lpng C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/Makefile index 22eadab78..1922b0f40 100644 --- a/src/osgPlugins/rgb/Makefile +++ b/src/osgPlugins/rgb/Makefile @@ -6,11 +6,13 @@ C++FILES = \ TARGET_BASENAME = osgdb_rgb -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) +LIB= -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L../../../lib -losg -losgUtil -losgDB -ldl -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/Makefile index 1a68bb616..139a826f5 100644 --- a/src/osgPlugins/tga/Makefile +++ b/src/osgPlugins/tga/Makefile @@ -7,13 +7,15 @@ C++FILES = \ TARGET_BASENAME = osgdb_tga -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/Makefile index 27d362b5e..d4692d827 100644 --- a/src/osgPlugins/tgz/Makefile +++ b/src/osgPlugins/tgz/Makefile @@ -6,13 +6,15 @@ C++FILES = \ TARGET_BASENAME = osgdb_tgz -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB = +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile index 8d1cb677b..a66289f68 100644 --- a/src/osgPlugins/tiff/Makefile +++ b/src/osgPlugins/tiff/Makefile @@ -7,13 +7,15 @@ C++FILES = \ TARGET_BASENAME = osgdb_tiff -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -LIBS = $(GL_LIBS) -losg -losgDB -ltiff +LIBS = $(GL_LIBS) -losg -losgDB -ltiff +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -ltiff -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/Makefile index 02f460920..38c14391a 100644 --- a/src/osgPlugins/zip/Makefile +++ b/src/osgPlugins/zip/Makefile @@ -6,13 +6,15 @@ C++FILES = \ TARGET_BASENAME = osgdb_zip -TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT) +TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT) -LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +LIB= +LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT) -TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT) +TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(DL_EXT) LIBS = $(GL_LIBS) -losg -losgDB +MACOSXLIBS = -L$(OSGHOME)/lib -losg -losgDB -lstdc++ C++FLAGS += -I. -I$(OSGHOME)/include LDFLAGS += -L$(OSGHOME)/lib