diff --git a/Make/makedefs.irix.nonstd b/Make/makedefs.irix.nonstd index 604a00cd5..a64509f53 100644 --- a/Make/makedefs.irix.nonstd +++ b/Make/makedefs.irix.nonstd @@ -19,8 +19,9 @@ LDFLAGS = -O2 -n32 -OPT:Olimit=0 .cpp.o: $(C++) $(C++FLAGS) -c $< +LINKERARGS = DYNAMICLIBRARYLIB = -PFLIBS = -lpfdu -lpfutil -lpf -limage +PFLOADERPATH = /usr/lib32/libpfdb GLUTLIB = -lglut # diff --git a/Make/makedefs.irix.std b/Make/makedefs.irix.std index 988837388..5ffbda176 100644 --- a/Make/makedefs.irix.std +++ b/Make/makedefs.irix.std @@ -19,8 +19,9 @@ LDFLAGS = -O2 -n32 -LANG:std -OPT:Olimit=0 .cpp.o: $(C++) $(C++FLAGS) -c $< +LINKERARGS = DYNAMICLIBRARYLIB = -PFLIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb -lpfpfb -lpfdu -lpfutil -lpf -limage +PFLOADERPATH = /usr/lib32/libpfdb GLUTLIB = -lglut # diff --git a/Make/makerules.irix b/Make/makerules.irix index b18f75739..dfb00039a 100644 --- a/Make/makerules.irix +++ b/Make/makerules.irix @@ -59,4 +59,4 @@ home : sinclude $(INSTRULES) -include $(MAKEDEPEND) +sinclude $(MAKEDEPEND) diff --git a/src/osgPlugins/Makefile b/src/osgPlugins/Makefile index 971426274..fe3e09a85 100644 --- a/src/osgPlugins/Makefile +++ b/src/osgPlugins/Makefile @@ -2,7 +2,7 @@ SHELL=/bin/sh #DIRS = osg rgb lib3ds flt pfb obj lwo dw bmp pic png jpeg tga tiff gif osgtgz tgz zip -DIRS = osg rgb lib3ds flt obj lwo dw bmp pic png jpeg tga tiff gif osgtgz tgz zip +DIRS = osg rgb lib3ds flt obj lwo dw bmp pic jpeg tga tiff osgtgz tgz zip all : for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile index 4aab16c49..fd422d8b6 100644 --- a/src/osgPlugins/pfb/Makefile +++ b/src/osgPlugins/pfb/Makefile @@ -45,7 +45,7 @@ TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.so C++FLAGS += -g -I../../../include -LDFLAGS += -g -L../../../lib -L$(PFLOADERPATH) -Xlinker -rpath $(PFLOADERPATH) +LDFLAGS += -g -L../../../lib -L$(PFLOADERPATH) $(LINKERARGS) -rpath $(PFLOADERPATH) include ../../../Make/makerules