diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-03-02 17:28:56 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-03-02 17:28:56 +0000 |
| commit | af745e5d4d6077fe46bd5692408475890848d66c (patch) | |
| tree | d18c7b720886a96b677fbe16e5e1487be0d3ad12 | |
| parent | 411b8faac47317e73ab9c285a85631a340a4ad53 (diff) | |
fixed linux-osmesa16-static. Added linux-static config
| -rw-r--r-- | Make-config | 22 | ||||
| -rw-r--r-- | Makefile.X11 | 5 | ||||
| -rw-r--r-- | src/mesa/Makefile.OSMesa16 | 2 |
3 files changed, 25 insertions, 4 deletions
diff --git a/Make-config b/Make-config index 4ff84af304..6d69ddc727 100644 --- 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 b5ec4be226..7945418627 100644 --- 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 4963ec47ed..758b1421a6 100644 --- 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 |