diff --git a/Make/makedefs b/Make/makedefs index db385ab11..6a8c9b625 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -82,8 +82,7 @@ RECURSIVE_TARGETS = \ docs\ depend\ -#### SUN OS Specific definitions -ifeq ($(OS),SunOS) +#### SUN OS Specific definitions ifeq ($(OS),SunOS) #### if useing g++ on a sun ifeq ($(COMPILER),gnu) @@ -101,6 +100,11 @@ else ARCHARGS = endif GLUT_LIB = -L/usr/local/glut-3.7/lib/glut -lglut + GIF_LIBS = -lgif + TIFF_LIB = -ltiff + JPEG_LIBS = -ljpeg + PNG_LIBS = -lnpg -lz + FREETYPE_LIB = -lfreetype OTHER_LIBS = #### using forte compilers (default) @@ -120,29 +124,20 @@ else endif GLUT_LIB = -lglut OTHER_LIBS = -lCstd - - INSTBINCMD = cp - INSTDEVCMD = cp - - INST_SYS_PREFIX = /opt/OpenSceneGraph - INST_SHARE_PREFIX = /opt - - MAKEDIST = $(TOPDIR)/Make/makepkg -endif - - LINKARGS = - DYNAMICLIBRARYLIB = -ldl - OSG_LIBS = -losgGLUT -losgGA -losgDB -losgUtil -losg - FREETYPE_LIB = /usr/local/lib/libfreetype.a - GL_LIBS = -lGLU -lGL - X_LIBS = -lXext -lXmu -lXi -lX11 - SOCKET_LIBS = -lsocket -lnsl GIF_LIBS = /usr/local/lib/libgif.a TIFF_LIB = /usr/local/lib/libtiff.a JPEG_LIBS = /usr/local/lib/libjpeg.a PNG_LIBS = /usr/local/lib/libpng.a /usr/local/lib/libz.a + FREETYPE_LIB = /usr/local/lib/libfreetype.a + + DYNAMICLIBRARYLIB = -ldl + OSG_LIBS = -losgGLUT -losgGA -losgDB -losgUtil -losg + + GL_LIBS = -lGLU -lGL + X_LIBS = -lXext -lXmu -lXi -lX11 + SOCKET_LIBS = -lsocket -lnsl INSTBINCMD = cp INSTDEVCMD = cp