diff options
| author | Keith Whitwell <[email protected]> | 2008-10-10 15:26:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-10-10 15:26:28 +0100 |
| commit | 3a3801c1431203fc4dca24d56577995ae2e78956 (patch) | |
| tree | 7ec341b78ecc62dc1a238392aff828c363148d69 /configs | |
| parent | d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f (diff) | |
| parent | 7216679c1998b49ff5b08e6b43f8d5779415bf54 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/glapi/descrip.mms
src/mesa/shader/grammar/descrip.mms
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/darwin | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configs/darwin b/configs/darwin index aa9efb66f5c..42897ac0336 100644 --- a/configs/darwin +++ b/configs/darwin @@ -12,10 +12,10 @@ CXX = gcc 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_INDIRECT_RENDERING \ - -DGLX_ALIAS_UNSUPPORTED + -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING # -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx/x11 +# -DGLX_USE_APPLEGL - supposed to be used with GLX_DIRECT_RENDERING to use AGL rather than DRM, but doesn't compile # -DIN_DRI_DRIVER ARCH_FLAGS += $(RC_CFLAGS) @@ -47,7 +47,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = glx/x11 mesa glu glw glut/glx +SRC_DIRS = glx/x11 mesa glu glut/glx GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri |