aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configs/darwin
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-15 11:25:17 +0200
committermarha <marha@users.sourceforge.net>2011-07-15 11:25:17 +0200
commit2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (patch)
tree7001b0332aba46855f1d01d7ef8ed80d134453a9 /mesalib/configs/darwin
parentd03a5f20114203fd00e0004659fd2617f4c03a32 (diff)
downloadvcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.gz
vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.bz2
vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.zip
xserver libX11 mesa git update 15 July
Diffstat (limited to 'mesalib/configs/darwin')
-rw-r--r--mesalib/configs/darwin5
1 files changed, 1 insertions, 4 deletions
diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin
index 9527f61bd..41e7ba800 100644
--- a/mesalib/configs/darwin
+++ b/mesalib/configs/darwin
@@ -33,7 +33,6 @@ CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing -fvisibility=hidden \
# Library names (actual file names)
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
@@ -41,7 +40,6 @@ VG_LIB_NAME = lib$(VG_LIB).dylib
# globs used to install the lib and all symlinks
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
@@ -49,12 +47,11 @@ 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 =
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt
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 mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx
+SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu
GLU_DIRS = sgi
DRIVER_DIRS = osmesa
#DRIVER_DIRS = dri