diff options
| author | Brian Paul <[email protected]> | 2004-01-10 22:14:51 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-01-10 22:14:51 +0000 |
| commit | ae6c594908567e6f980be20cda9a96d8fffe56b7 (patch) | |
| tree | 29f6098988271b42813b3150a73b72de170bb0cd | |
| parent | 12d6caea08e5840e7852573a1dcb34b4c6f16192 (diff) | |
added aix-gcc config
| -rw-r--r-- | Make-config | 17 | ||||
| -rw-r--r-- | Makefile.X11 | 11 |
2 files changed, 23 insertions, 5 deletions
diff --git a/Make-config b/Make-config index 0bb79654788..0e420ebaa4b 100644 --- a/Make-config +++ b/Make-config @@ -61,6 +61,23 @@ aix-sl: "MAKELIB = $(TOP)/bin/mklib.aix" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" +aix-gcc: + $(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" \ + "CC = gcc" \ + "CFLAGS = -O -DAIXV3" \ + "CXX = g++" \ + "CXXFLAGS = -O -DAIXV3" \ + "MKLIB_OPTIONS = -arch aix-gcc" \ + "GL_LIB_DEPS = -lX11 -lXext -lm" \ + "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLUT -lGL" \ + "APP_LIB_DEPS = -Wl,-brtl -lX11 -lXext -lXmu -lXi -lm" + beos-r4: $(MAKE) -f Makefile.BeOS-R4 targets \ "GL_LIB = libGL.so" \ diff --git a/Makefile.X11 b/Makefile.X11 index d1e80245db8..364b67ae5e4 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.105 2004/01/05 16:42:34 brianp Exp $ +# $Id: Makefile.X11,v 1.106 2004/01/10 22:14:51 brianp Exp $ # Mesa 3-D graphics library # Version: 6.0 @@ -33,8 +33,9 @@ SHELL = /bin/sh default: @echo "Type one of the following:" - @echo " make aix for IBM RS/6000 with AIX" - @echo " make aix-sl for IBM RS/6000, make shared libs" + @echo " make aix for AIX systems with xlc" + @echo " make aix-sl for AIX systems, make shared libs" + @echo " make aix-gcc for AIX sytems with gcc" @echo " make beos-r4 for BeOS R4" @echo " make cygnus for Win95/NT using Cygnus-Win32" @echo " make cygnus-linux for Win95/NT using Cygnus-Win32 under Linux" @@ -104,8 +105,8 @@ default: # XXX we may have to split up this group of targets into those that # have a C++ compiler and those that don't for the SI-GLU library. -aix aix-sl darwin freebsd freebsd-386 gcc-sl \ -cygnus cygnus-linux: +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 \ |