diff --git a/Make/makedefs.irix.std.64 b/Make/makedefs.irix.std.64 index a10f8e53f..f849f4110 100644 --- a/Make/makedefs.irix.std.64 +++ b/Make/makedefs.irix.std.64 @@ -48,7 +48,7 @@ TARGET_DIRS = \ TARGET_BIN = /usr/bin -TARGET_LIB = /usr/lib32 +TARGET_LIB = /usr/lib64 TARGET_INCLUDE = /usr/include TARGET_DATA = /usr/share/OpenSceneGraph/data TARGET_LOADER_LIB = /usr/lib/osgPlugins diff --git a/Makefile b/Makefile index a789ce643..80ece9215 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake SHELL=/bin/sh MAKE_PREP = Make/makedefs Make/makerules diff --git a/src/Demos/Makefile b/src/Demos/Makefile index 887bf7fa0..5b7c5126c 100644 --- a/src/Demos/Makefile +++ b/src/Demos/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake SHELL=/bin/sh DIRS = sgv osgconv osgcube osgscribe osgreflect osgtexture osgimpostor osgviews osgcopy osgbillboard hangglide diff --git a/src/Demos/hangglide/Makefile b/src/Demos/hangglide/Makefile index 46e2118ef..3ae42d09c 100644 --- a/src/Demos/hangglide/Makefile +++ b/src/Demos/hangglide/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgbillboard/Makefile b/src/Demos/osgbillboard/Makefile index 5f400881a..cad710312 100644 --- a/src/Demos/osgbillboard/Makefile +++ b/src/Demos/osgbillboard/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgcluster/Makefile b/src/Demos/osgcluster/Makefile index 944337cd7..4e2d57a80 100644 --- a/src/Demos/osgcluster/Makefile +++ b/src/Demos/osgcluster/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgcopy/Makefile b/src/Demos/osgcopy/Makefile index e8304729a..f0189e70d 100644 --- a/src/Demos/osgcopy/Makefile +++ b/src/Demos/osgcopy/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgcube/Makefile b/src/Demos/osgcube/Makefile index a4a5426dc..061aa8c05 100644 --- a/src/Demos/osgcube/Makefile +++ b/src/Demos/osgcube/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgimpostor/Makefile b/src/Demos/osgimpostor/Makefile index 4a42c0f85..6ae671ac0 100644 --- a/src/Demos/osgimpostor/Makefile +++ b/src/Demos/osgimpostor/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgreflect/Makefile b/src/Demos/osgreflect/Makefile index 61724b009..d2cd19717 100644 --- a/src/Demos/osgreflect/Makefile +++ b/src/Demos/osgreflect/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgscribe/Makefile b/src/Demos/osgscribe/Makefile index 955b15a7d..b3ddf85f0 100644 --- a/src/Demos/osgscribe/Makefile +++ b/src/Demos/osgscribe/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgtext/Makefile b/src/Demos/osgtext/Makefile index a9e0fc8ac..9943bfcae 100644 --- a/src/Demos/osgtext/Makefile +++ b/src/Demos/osgtext/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgtexture/Makefile b/src/Demos/osgtexture/Makefile index 935ff2769..e9436054c 100644 --- a/src/Demos/osgtexture/Makefile +++ b/src/Demos/osgtexture/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/osgviews/Makefile b/src/Demos/osgviews/Makefile index 775930707..c0ce13271 100644 --- a/src/Demos/osgviews/Makefile +++ b/src/Demos/osgviews/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Demos/sgv/Makefile b/src/Demos/sgv/Makefile index f427274f2..f1fc7263e 100644 --- a/src/Demos/sgv/Makefile +++ b/src/Demos/sgv/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/Makefile b/src/Makefile index 176e87ce6..c2828c3e2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake SHELL=/bin/sh DIRS = osg osgDB osgUtil osgGLUT diff --git a/src/osg/Makefile b/src/osg/Makefile index cf2674180..ef0379add 100644 --- a/src/osg/Makefile +++ b/src/osg/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgDB/Makefile b/src/osgDB/Makefile index 84869ef61..a705de3cb 100644 --- a/src/osgDB/Makefile +++ b/src/osgDB/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgGLUT/Makefile b/src/osgGLUT/Makefile index 62996e582..b8f6b7684 100644 --- a/src/osgGLUT/Makefile +++ b/src/osgGLUT/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/Makefile b/src/osgPlugins/Makefile index 48fbf1e8f..c3983dc3c 100644 --- a/src/osgPlugins/Makefile +++ b/src/osgPlugins/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake SHELL=/bin/sh DIRS = osg rgb lib3ds flt obj lwo txp dw bmp pic tga osgtgz tgz zip diff --git a/src/osgPlugins/bmp/Makefile b/src/osgPlugins/bmp/Makefile index bdff3a930..d4bc90815 100644 --- a/src/osgPlugins/bmp/Makefile +++ b/src/osgPlugins/bmp/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/Makefile index 8d55c8deb..df3591b54 100644 --- a/src/osgPlugins/dw/Makefile +++ b/src/osgPlugins/dw/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = ReaderWriterDW.cpp diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/Makefile index 7b3db76bc..0da6f4397 100644 --- a/src/osgPlugins/flt/Makefile +++ b/src/osgPlugins/flt/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile index 4e97d685f..82b96d489 100644 --- a/src/osgPlugins/gif/Makefile +++ b/src/osgPlugins/gif/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/Makefile index 9412e4cfd..eb2f62b02 100644 --- a/src/osgPlugins/jpeg/Makefile +++ b/src/osgPlugins/jpeg/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/Makefile index ab7d2f468..4e1a85b5d 100644 --- a/src/osgPlugins/lib3ds/Makefile +++ b/src/osgPlugins/lib3ds/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/Makefile index b6071fef6..dc7b56637 100644 --- a/src/osgPlugins/lwo/Makefile +++ b/src/osgPlugins/lwo/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = ReaderWriterLWO.cpp lw.cpp diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/Makefile index 48add882d..c69516cfb 100644 --- a/src/osgPlugins/obj/Makefile +++ b/src/osgPlugins/obj/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = ReaderWriterOBJ.cpp glm.cpp diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile index 2e28b1f93..16ffac421 100644 --- a/src/osgPlugins/osg/Makefile +++ b/src/osgPlugins/osg/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/Makefile index 2101bbda5..f21b427cb 100644 --- a/src/osgPlugins/osgtgz/Makefile +++ b/src/osgPlugins/osgtgz/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile index b0fb80308..588e55ab2 100644 --- a/src/osgPlugins/pfb/Makefile +++ b/src/osgPlugins/pfb/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include ../../../Make/makedefs CFILES = \ diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/Makefile index a9a526931..301fd91ce 100644 --- a/src/osgPlugins/pic/Makefile +++ b/src/osgPlugins/pic/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile index ed8029e43..5ed4cabbe 100644 --- a/src/osgPlugins/png/Makefile +++ b/src/osgPlugins/png/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/quicktime/Makefile b/src/osgPlugins/quicktime/Makefile index 18a677c1b..22c28cd9f 100644 --- a/src/osgPlugins/quicktime/Makefile +++ b/src/osgPlugins/quicktime/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include ../../../Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/Makefile index 1922b0f40..5fd539d23 100644 --- a/src/osgPlugins/rgb/Makefile +++ b/src/osgPlugins/rgb/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/Makefile index c95abd80a..39fd6a4a1 100644 --- a/src/osgPlugins/tga/Makefile +++ b/src/osgPlugins/tga/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/Makefile index 1dc73cb63..bb3e91968 100644 --- a/src/osgPlugins/tgz/Makefile +++ b/src/osgPlugins/tgz/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile index f9c89b0a7..6205023d0 100644 --- a/src/osgPlugins/tiff/Makefile +++ b/src/osgPlugins/tiff/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include ../../../Make/makedefs C++FILES = \ diff --git a/src/osgPlugins/txp/Makefile b/src/osgPlugins/txp/Makefile index de274473b..daff43c58 100644 --- a/src/osgPlugins/txp/Makefile +++ b/src/osgPlugins/txp/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake SHELL = /bin/sh include $(OSGHOME)/Make/makedefs diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/Makefile index 97d63908b..f65bbd1b8 100644 --- a/src/osgPlugins/zip/Makefile +++ b/src/osgPlugins/zip/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include ../../../Make/makedefs C++FILES = \ diff --git a/src/osgText/Makefile b/src/osgText/Makefile index db37a2955..67363d223 100644 --- a/src/osgText/Makefile +++ b/src/osgText/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \ diff --git a/src/osgUtil/Makefile b/src/osgUtil/Makefile index 3d2ae2926..2509c8a3a 100644 --- a/src/osgUtil/Makefile +++ b/src/osgUtil/Makefile @@ -1,4 +1,4 @@ -#!smake +#!gmake include $(OSGHOME)/Make/makedefs C++FILES = \