diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
| commit | 0c0b98ae72397aeed280ffc146b16eb13065f332 (patch) | |
| tree | 4a34d9ba1cc396e912aa5b473bc0a5bba968d656 /mesalib/configs/darwin | |
| parent | ddf3c86d1414ac4d95e352b195ac30188f024429 (diff) | |
| parent | 022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc (diff) | |
| download | vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.gz vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.bz2 vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/configs/darwin')
| -rw-r--r-- | mesalib/configs/darwin | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin index d28d5906b..e51968487 100644 --- a/mesalib/configs/darwin +++ b/mesalib/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 |