diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-05-31 16:36:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-05-31 16:36:50 +0000 |
| commit | edbbb30acbaac6dea32efa3b4c4e7e8889abff8c (patch) | |
| tree | 3cb8e3971ac4700aab604f90adf30c0fc2dabd87 /dist/Mesa/configs/darwin | |
| parent | 793dbf86dba9abbe60b4cff5b0049e603ab61e7e (diff) | |
Update to Mesa 7.0.3. tested my oga@ and johan@
Diffstat (limited to 'dist/Mesa/configs/darwin')
| -rw-r--r-- | dist/Mesa/configs/darwin | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/dist/Mesa/configs/darwin b/dist/Mesa/configs/darwin index 76f3f74d4..c7f94d2ba 100644 --- a/dist/Mesa/configs/darwin +++ b/dist/Mesa/configs/darwin @@ -4,11 +4,18 @@ include $(TOP)/configs/default CONFIG_NAME = darwin +DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \ + -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE \ + -DPTHREADS -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING + # Compiler and flags -CC = cc -CXX = cc -CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin -CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +CC = gcc +CXX = gcc +CFLAGS = -I/usr/X11/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin $(DEFINES) +CXXFLAGS = -I/usr/X11/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin $(DEFINES) + +CFLAGS += $(RC_CFLAGS) +CXXFLAGS += $(RC_CFLAGS) # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing @@ -21,13 +28,13 @@ GLUT_LIB_NAME = libglut.dylib GLW_LIB_NAME = libGLw.dylib OSMESA_LIB_NAME = libOSMesa.dylib -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread +GL_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lm -lpthread OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib -APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm +APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11/lib -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = mesa glu glut/glx - +SRC_DIRS = glx/x11 glu glut/glx mesa +DRIVER_DIRS = osmesa |