util: add u_box_3d

[mesa.git] / configs / darwin

diff --git a/configs/darwin b/configs/darwin
index 29fa0f13ff44a53712819153b3d94b9165055911..147679f07a791b3676d03b7352278945e0542793 100644 (file)
--- a/configs/darwin
+++ b/configs/darwin
@@ -10,13 +10,16 @@ X11_DIR = $(INSTALL_DIR)
 
 # Compiler and flags
 CC = gcc
-CXX = gcc
+CXX = g++
 PIC_FLAGS = -fPIC
-DEFINES =  -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \
-          -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DPTHREADS \
-          -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
+DEFINES =  -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
+          -DGLX_ALIAS_UNSUPPORTED \
+          -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
 
-# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx/x11
+# -DGLX_INDIRECT_RENDERING \
+
+# -D_GNU_SOURCE          - for src/mesa/main ...
+# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx
 # -DGLX_USE_APPLEGL      - supposed to be used with GLX_DIRECT_RENDERING to use AGL rather than DRM, but doesn't compile
 # -DIN_DRI_DRIVER
 
@@ -49,9 +52,8 @@ 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 = glx/x11 mesa glu glut/glx glew
+SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx glew
 GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
 DRI_DIRS = swrast
-PROGRAM_DIRS = xdemos