aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configs
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-07 07:56:56 +0200
committermarha <marha@users.sourceforge.net>2011-06-07 07:56:56 +0200
commit4dc4001b1b78cc236548d9a01365ee4c04ee22a3 (patch)
tree9926bef1a36bfba16e2ef67ea85c916d6ddeaacb /mesalib/configs
parent336e4aab196609a528213e9ecebcb30fce7aa654 (diff)
parent09a5e4f06e54a817ecbb04b3e2bdc28f27fa3e61 (diff)
downloadvcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.tar.gz
vcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.tar.bz2
vcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/randr/rrcrtc.c
Diffstat (limited to 'mesalib/configs')
-rw-r--r--mesalib/configs/darwin24
1 files changed, 14 insertions, 10 deletions
diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin
index 990610724..3cf1110b4 100644
--- a/mesalib/configs/darwin
+++ b/mesalib/configs/darwin
@@ -31,18 +31,20 @@ CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing \
-I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
# Library names (actual file names)
-GL_LIB_NAME = libGL.dylib
-GLU_LIB_NAME = libGLU.dylib
-GLUT_LIB_NAME = libglut.dylib
-GLW_LIB_NAME = libGLw.dylib
-OSMESA_LIB_NAME = libOSMesa.dylib
+GL_LIB_NAME = lib$(GL_LIB).dylib
+GLU_LIB_NAME = lib$(GLU_LIB).dylib
+GLUT_LIB_NAME = lib$(GLUT_LIB).dylib
+GLW_LIB_NAME = lib$(GLW_LIB).dylib
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).dylib
+VG_LIB_NAME = lib$(VG_LIB).dylib
# globs used to install the lib and all symlinks
-GL_LIB_GLOB = libGL.*dylib
-GLU_LIB_GLOB = libGLU.*dylib
-GLUT_LIB_GLOB = libglut.*dylib
-GLW_LIB_GLOB = libGLw.*dylib
-OSMESA_LIB_GLOB = libOSMesa.*dylib
+GL_LIB_GLOB = lib$(GL_LIB).*dylib
+GLU_LIB_GLOB = lib$(GLU_LIB).*dylib
+GLUT_LIB_GLOB = lib$(GLUT_LIB).*dylib
+GLW_LIB_GLOB = lib$(GLW_LIB).*dylib
+OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
+VG_LIB_GLOB = lib$(VG_LIB).*.dylib
GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
@@ -57,3 +59,5 @@ GLU_DIRS = sgi
DRIVER_DIRS = osmesa
#DRIVER_DIRS = dri
DRI_DIRS = swrast
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad failover
+#GALLIUM_DRIVERS_DIRS += llvmpipe