From 762b7fde3d57d3a151f98535fd31516b7e823bc0 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 30 Apr 2012 10:36:15 +0200 Subject: fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012 --- mesalib/configs/autoconf.in | 4 ---- mesalib/configs/darwin | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'mesalib/configs') diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in index ec3f3194e..eb6713ddf 100644 --- a/mesalib/configs/autoconf.in +++ b/mesalib/configs/autoconf.in @@ -217,9 +217,5 @@ WAYLAND_LIBS = @WAYLAND_LIBS@ MESA_LLVM = @MESA_LLVM@ LLVM_VERSION = @LLVM_VERSION@ -ifneq ($(LLVM_VERSION),) - HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=)) - DEFINES += -DHAVE_LLVM=$(HAVE_LLVM) -endif HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@ diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin index 721fbc780..12e6e3a06 100644 --- a/mesalib/configs/darwin +++ b/mesalib/configs/darwin @@ -52,10 +52,10 @@ OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS) GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS) GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS) -SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu +SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa glu GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri DRI_DIRS = swrast -GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad +#GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad #GALLIUM_DRIVERS_DIRS += llvmpipe -- cgit v1.2.3