Add darwin target

diff --git a/Make-config b/Make-config
index 52b9189188fd776b7c126f2bc107b9623b214ffd..b3c9fcd3e45d0b16c89ee696cf06034022e12178 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.54 2001/11/23 20:09:26 brianp Exp $
+# $Id: Make-config,v 1.55 2001/11/30 19:41:19 kschultz Exp $
 
 MESA_MAJOR=4
 MESA_MINOR=1
@@ -178,6 +178,25 @@ cygnus-linux:
        "MAKELIB = ../bin/mklib.cygnus-linux" \
        "WLIBS = ../lib/wing32.a -lkernel32 -luser32 -lgdi32"
 
+darwin:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.dylib" \
+       "GLU_LIB = libGLU.dylib" \
+       "GLUT_LIB = libglut.dylib" \
+       "GLW_LIB = libGLw.dylib" \
+       "OSMESA_LIB = libOSMesa.dylib" \
+       "CC = cc" \
+       "CPLUSPLUS = cc" \
+       "CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math \
+                -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+                -dynamic -Ddarwin" \
+       "CCFLAGS = $(CFLAGS)" \
+       "MAKELIB = ../bin/mklib.darwin" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
+       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L../lib -lGLU -lGL \
+                       -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" 
+
 dgux:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \

diff --git a/Makefile.X11 b/Makefile.X11
index d992adef9dc4f2314507fdd929ce5cb6491fc458..093807bfaa9e1dc914804ec10b7a1f69fb609fff 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.57 2001/10/22 22:45:18 brianp Exp $
+# $Id: Makefile.X11,v 1.58 2001/11/30 19:42:10 kschultz Exp $
 
 # Mesa 3-D graphics library
 # Version:  4.1
@@ -42,6 +42,7 @@ default:
        @echo "  make bsdos4               for BSD/OS 4.x, dynamic libraries"
        @echo "  make cygnus               for Win95/NT using Cygnus-Win32"
        @echo "  make cygnus-linux         for Win95/NT using Cygnus-Win32 under Linux"
+       @echo "  make darwin               for Darwin - Mac OS X"
        @echo "  make dgux                 for Data General"
        @echo "  make freebsd              for FreeBSD systems with GCC"
        @echo "  make freebsd-386          for FreeBSD systems with GCC, w/ Intel assembly"
@@ -137,7 +138,7 @@ 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 amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
+aix aix-sl amix bsdos bsdos4 darwin dgux freebsd freebsd-386 gcc \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \