diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-23 08:37:42 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-23 08:37:42 +0100 |
| commit | 6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7 (patch) | |
| tree | e151dcf34c7fa60fcf9bde9963638f3c20a567f6 /mesalib/configs | |
| parent | dc56d736fcd8ee767f76674981abbb506a1d69d5 (diff) | |
| parent | 45e3694d529b052f4122262c9bdff5476219b2b4 (diff) | |
| download | vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.tar.gz vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.tar.bz2 vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configs')
| -rw-r--r-- | mesalib/configs/autoconf.in | 1 | ||||
| -rw-r--r-- | mesalib/configs/freebsd-dri | 3 | ||||
| -rw-r--r-- | mesalib/configs/linux-dri | 2 | ||||
| -rw-r--r-- | mesalib/configs/linux-dri-debug | 6 | ||||
| -rw-r--r-- | mesalib/configs/linux-dri-ppc | 8 | ||||
| -rw-r--r-- | mesalib/configs/linux-dri-x86-64 | 3 | ||||
| -rw-r--r-- | mesalib/configs/linux-dri-xcb | 1 |
7 files changed, 1 insertions, 23 deletions
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in index 9ea7588a1..3e5da796f 100644 --- a/mesalib/configs/autoconf.in +++ b/mesalib/configs/autoconf.in @@ -15,7 +15,6 @@ ASM_FLAGS = @ASM_FLAGS@ PIC_FLAGS = @PIC_FLAGS@ DEFINES = @DEFINES@ API_DEFINES = @API_DEFINES@ -SHARED_GLAPI = @SHARED_GLAPI@ CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri index b18ac51e3..00a11d45c 100644 --- a/mesalib/configs/freebsd-dri +++ b/mesalib/configs/freebsd-dri @@ -46,6 +46,3 @@ SRC_DIRS = glx gallium mesa glu DRIVER_DIRS = dri DRM_SOURCE_PATH=$(TOP)/../drm - -DRI_DIRS = i915 i965 r200 radeon - diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index dde640897..a5efea25d 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -62,7 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm GALLIUM_TARGET_DIRS = dri-vmwgfx GALLIUM_STATE_TRACKERS_DIRS = egl dri -DRI_DIRS = i915 nouveau r200 radeon swrast +DRI_DIRS = swrast INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel) INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel) diff --git a/mesalib/configs/linux-dri-debug b/mesalib/configs/linux-dri-debug index a1a4465d8..4ee5d71ee 100644 --- a/mesalib/configs/linux-dri-debug +++ b/mesalib/configs/linux-dri-debug @@ -6,9 +6,3 @@ include $(TOP)/configs/linux-dri CONFIG_NAME = linux-dri-debug OPT_FLAGS = -O0 -g ARCH_FLAGS = -DDEBUG - -# Helpful to reduce the amount of stuff that gets built sometimes: -#DRI_DIRS = i915tex i915 -#DRI_DIRS = i965 -#DRI_DIRS = radeon r200 - diff --git a/mesalib/configs/linux-dri-ppc b/mesalib/configs/linux-dri-ppc index 5dd3615ff..fdf3c5c7a 100644 --- a/mesalib/configs/linux-dri-ppc +++ b/mesalib/configs/linux-dri-ppc @@ -7,11 +7,3 @@ CONFIG_NAME = linux-dri-ppc OPT_FLAGS = -Os -mcpu=603 PIC_FLAGS = -fPIC - -ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM -MESA_ASM_SOURCES = $(PPC_SOURCES) - -# Build only the drivers for cards that exist on PowerPC. At some point MGA -# will be added, but not yet. -DRI_DIRS = r200 radeon - diff --git a/mesalib/configs/linux-dri-x86-64 b/mesalib/configs/linux-dri-x86-64 index c1dff630f..6cd629407 100644 --- a/mesalib/configs/linux-dri-x86-64 +++ b/mesalib/configs/linux-dri-x86-64 @@ -15,6 +15,3 @@ LIB_DIR = lib64 # Library/program dependencies EXTRA_LIB_PATH=-L/usr/X11R6/lib64 - -DRI_DIRS = i915 i965 r200 radeon - diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb index 85665207b..fd72c683f 100644 --- a/mesalib/configs/linux-dri-xcb +++ b/mesalib/configs/linux-dri-xcb @@ -52,4 +52,3 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ SRC_DIRS = glx gallium mesa glu DRIVER_DIRS = dri -DRI_DIRS = i915 r200 radeon |