summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-04-01 11:18:42 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-04-01 12:33:47 -0700
commitdbe8b013936d977ec63d6607bfd2fc6772d29787 (patch)
treee47e8c13b5a6e056c14778fe396c16ab65867284 /configs
parent23215ef4d60a86d9f3b3fdc08e3fdadc59e98890 (diff)
downloadexternal_mesa3d-dbe8b013936d977ec63d6607bfd2fc6772d29787.zip
external_mesa3d-dbe8b013936d977ec63d6607bfd2fc6772d29787.tar.gz
external_mesa3d-dbe8b013936d977ec63d6607bfd2fc6772d29787.tar.bz2
apple: Integrate our libGL into the existing build system better
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/darwin7
1 files changed, 5 insertions, 2 deletions
diff --git a/configs/darwin b/configs/darwin
index d28d590..e519684 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -13,7 +13,10 @@ CC = gcc
CXX = g++
PIC_FLAGS = -fPIC
DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
- -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
+ -DGLX_ALIAS_UNSUPPORTED \
+ -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
+
+# -DGLX_INDIRECT_RENDERING \
# -D_GNU_SOURCE - for src/mesa/main ...
# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx
@@ -49,7 +52,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
-SRC_DIRS = glsl glx mesa gallium glu glut/glx glew
+SRC_DIRS = glsl glx/apple mesa gallium glu glut/glx glew
GLU_DIRS = sgi
DRIVER_DIRS = osmesa
#DRIVER_DIRS = dri