fixed linux-osmesa16-static. Added linux-static config

diff --git a/Make-config b/Make-config
index 4ff84af3043a60d3c5157592499350cb378b1d49..6d69ddc727f9c3245c37689af314618164c71ab9 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -454,6 +454,25 @@ linux:
        "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
        "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
 
+linux-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "OSMESA_LIB = libOSMesa.a" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+       "CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = " \
+       "GLU_LIB_DEPS = " \
+       "GLUT_LIB_DEPS = " \
+       "GLW_LIB_DEPS = " \
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXext -lXi -lXmu -lpthread -lm -lstdc++" \
+       "MKLIB_OPTIONS = -static"
+
 linux-x86:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -735,7 +754,8 @@ linux-osmesa16-static:
        "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
        "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -lm -lpthread" \
-       "APP_LIB_DEPS = -lOSMesa16 -lGL"
+       "APP_LIB_DEPS = -lOSMesa16 -lGL" \
+       "MKLIB_OPTIONS = -static"
 
 # 32-bit/channel Mesa using OSMesa driver
 linux-osmesa32:

diff --git a/Makefile.X11 b/Makefile.X11
index b5ec4be2261e7d85dfa33c37f704ff47c97d23b9..79454186270fb123c31d92abfd54ebb2b3724271 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.113 2004/01/30 23:32:19 brianp Exp $
+# $Id: Makefile.X11,v 1.114 2004/03/02 17:28:56 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  6.1
@@ -60,6 +60,7 @@ default:
        @echo "  make irix6-64-dso          for SGI systems with IRIX 6.x, make 64-bit DSOs"
 
        @echo "  make linux                 for Linux"
+       @echo "  make linux-static          for Linux, make static libs"
        @echo "  make linux-x86             for Linux with x86 optimizations"
        @echo "  make linux-ggi             for Linux with libggi driver"
        @echo "  make linux-x86-ggi         for Linux with libggi driver and x86 optimizations"
@@ -109,7 +110,7 @@ aix aix-sl aix-gcc darwin freebsd freebsd-386 gcc-sl \
 cygnus cygnus-linux \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
-linux linux-debug \
+linux linux-debug linux-static \
 linux-x86 linux-x86-sse linux-icc linux-x86-static linux-x86-debug \
 linux-glide linux-x86-glide linux-glide-debug \
 linux-alpha-static linux-alpha \

diff --git a/src/mesa/Makefile.OSMesa16 b/src/mesa/Makefile.OSMesa16
index 4963ec47edf0b17dc286cf82a9eb8d09934a1143..758b1421a62fce673f1195f4f50fb35b85e0237c 100644 (file)
--- a/src/mesa/Makefile.OSMesa16
+++ b/src/mesa/Makefile.OSMesa16
@@ -66,7 +66,7 @@ targets: $(LIBDIR)/$(OSMESA_LIB)
 $(LIBDIR)/$(OSMESA_LIB): $(OBJECTS)
        $(TOP)/bin/mklib $(MAKELIB_FLAGS) -o $(OSMESA_LIB_NAME) \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(LIBDIR) $(GL_LIB_DEPS) $(OBJECTS)
+               $(MKLIB_OPTIONS) -install $(LIBDIR) $(GL_LIB_DEPS) $(OBJECTS)
 
 
 # Run 'make dep' to update the dependencies if you change what's included