From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 29 Jan 2004 15:21:47 +0000 (+0000)
Subject: more IRIX tweaks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8c31fcba38f55932a9209a1778265c66466b623;p=mesa.git

more IRIX tweaks
---

diff --git a/Make-config b/Make-config
index 031e8ddf88a..55b08e865fc 100644
--- a/Make-config
+++ b/Make-config
@@ -322,6 +322,7 @@ irix6-o32:
 	"CXX = CC" \
 	"CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \
 	"CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \
+	"MKLIB_OPTIONS = -archopt o32 -static" \
 	"APP_LIB_DEPS = -32 -glut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-o32-dso:
@@ -336,6 +337,7 @@ irix6-o32-dso:
 	"CXX = CC" \
 	"CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \
 	"CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \
+	"MKLIB_OPTIONS = -archopt o32" \
 	"APP_LIB_DEPS = -32 -rpath $(TOP)/lib32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32:
@@ -350,6 +352,7 @@ irix6-n32:
 	"CXX = CC" \
 	"CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \
 	"CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \
+	"MKLIB_OPTIONS = -static" \
 	"APP_LIB_DEPS = -n32 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32-dso:
@@ -401,6 +404,7 @@ irix6-64:
 	"CXX = CC" \
 	"CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
 	"CXXFLAGS = -64 -O3 -ansi -woff 1174" \
+	"MKLIB_OPTIONS = -archopt 64 -static" \
 	"APP_LIB_DEPS = -64 -lglut -lGLU -lGL -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-64-dso:
@@ -415,8 +419,23 @@ irix6-64-dso:
 	"CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
 	"CXX = CC" \
 	"CXXFLAGS = -64 -O3 -ansi -woff 1174" \
+	"MKLIB_OPTIONS = -archopt 64" \
 	"APP_LIB_DEPS = -64 -rpath $(TOP)/lib64 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lm"
 
+irix6-mgl-n32-dso:
+	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+	"GL_LIB = libGL.so" \
+	"GLU_LIB = libGLU.so" \
+	"GLUT_LIB = libglut.so" \
+	"GLW_LIB = libGLw.so" \
+	"OSMESA_LIB = libOSMesa.so" \
+	"LIBDIR = $(TOP)/libMGL32" \
+	"CC = cc" \
+	"CXX = CC" \
+	"CFLAGS = -n32 -DUSE_MGL_NAMESPACE -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \
+	"CXXFLAGS = -n32 -DUSE_MGL_NAMESPACE -mips3 -O3 -ansi -woff 1174,1552" \
+	"APP_LIB_DEPS = -n32 -rpath $(TOP)/libMGL32 -lglut -lGLU -lGL -lX11 -lXmu -lXi -lfpe -lm" 
+
 linux:
 	$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
 	"GL_LIB = libGL.so" \
diff --git a/Makefile.X11 b/Makefile.X11
index 4427e817ed5..198c073b92a 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.110 2004/01/28 22:00:13 brianp Exp $
+# $Id: Makefile.X11,v 1.111 2004/01/29 15:21:47 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  6.1
@@ -241,6 +241,19 @@ irix6-64 irix6-64-dso:
 		$(MAKE) -f Makefile.X11 $@ ; \
 	fi
 
+irix6-mgl-n32-dso:
+        -mkdir libMGL32
+        if [ -d src/mesa ] ; then \
+                cd src/mesa ; \
+                touch depend ; \
+                $(MAKE) -f Makefile.X11 $@ ; \
+        fi
+        if [ -d src/glu/sgi ] ; then \
+                cd src/glu/sgi ; \
+                touch depend ; \
+                $(MAKE) -f Makefile.X11 $@ ; \
+        fi
+
 beos-r4:
 	-mkdir lib
 	if [ -d src/mesa ] ; then \
@@ -549,7 +562,7 @@ LIB_FILES =	\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.h				\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
-	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms			\
+	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
diff --git a/bin/mklib b/bin/mklib
index 0f3bcdbcb17..2678806516c 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -223,7 +223,7 @@ case $ARCH in
 	FINAL_LIBS="${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION}"
 	;;
 
-    'IRIX')
+    'IRIX' | 'IRIX64')
 	LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	if [ $ARCHOPT = "64" ] ; then
 	    # 64-bit ABI
@@ -247,20 +247,6 @@ case $ARCH in
 	FINAL_LIBS="${LIBNAME}"
 	;;
 
-    'IRIX64')
-	LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
-	echo "mklib: Making IRIX64 library: " ${LIBNAME}
-	# 64-bit ABI
-	OPTS="-64 -shared -all"
-	if [ $CPLUSPLUS = 1 ] ; then
-	    LINK="CC"
-	else
-	    LINK="ld"
-	fi
-	${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
-	FINAL_LIBS="${LIBNAME}"
-	;;
-
     'linux-cygwin')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making linux-cygwin library: " ${LIBNAME}