diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /mesalib/configs | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.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/default | 3 | ||||
| -rw-r--r-- | mesalib/configs/linux-dri | 3 | ||||
| -rw-r--r-- | mesalib/configs/linux-opengl-es | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in index 0ec517166..296bf30d9 100644 --- a/mesalib/configs/autoconf.in +++ b/mesalib/configs/autoconf.in @@ -103,7 +103,6 @@ LIB_DIR = @LIB_DIR@ SRC_DIRS = @SRC_DIRS@ GLU_DIRS = @GLU_DIRS@ DRIVER_DIRS = @DRIVER_DIRS@ -EGL_DRIVERS_DIRS = @EGL_DRIVERS_DIRS@ GALLIUM_DIRS = @GALLIUM_DIRS@ GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@ GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@ diff --git a/mesalib/configs/default b/mesalib/configs/default index 43cb51076..cdaeec8b4 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -104,9 +104,6 @@ SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa -# EGL drivers to build -EGL_DRIVERS_DIRS = glx - # Gallium directories and GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index a5efea25d..f1fb37842 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -54,9 +54,6 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ # Directories SRC_DIRS := glx egl $(SRC_DIRS) -# EGL directories -EGL_DRIVERS_DIRS = glx - DRIVER_DIRS = dri GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm GALLIUM_TARGET_DIRS = dri-vmwgfx diff --git a/mesalib/configs/linux-opengl-es b/mesalib/configs/linux-opengl-es index 93c0d4770..ae48a383f 100644 --- a/mesalib/configs/linux-opengl-es +++ b/mesalib/configs/linux-opengl-es @@ -14,7 +14,6 @@ DEFINES += -DGLX_DIRECT_RENDERING # no mesa or egl drivers DRIVER_DIRS = -EGL_DRIVERS_DIRS = GALLIUM_DRIVERS_DIRS = softpipe |