diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
| commit | e3a6ca7bffc785a13361efdbf81ef4776c050df0 (patch) | |
| tree | 2277a7dccab07794bd37b255ae6b5e2716e0c855 /mesalib/configs/default | |
| parent | 780fcf7fcf5701c79568c95f32823cfa8e564665 (diff) | |
| parent | b683b8f5675e280a6dd4ab82d6b9394182798b55 (diff) | |
| download | vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.gz vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.bz2 vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/grabs.c
Diffstat (limited to 'mesalib/configs/default')
| -rw-r--r-- | mesalib/configs/default | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mesalib/configs/default b/mesalib/configs/default index 2ca6fe45d..7e1aceb6b 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -63,7 +63,6 @@ GLESv2_LIB = GLESv2 VG_LIB = OpenVG GLAPI_LIB = glapi WAYLAND_EGL_LIB = wayland-egl -GBM_LIB = gbm # Library names (actual file names) GL_LIB_NAME = lib$(GL_LIB).so @@ -76,7 +75,6 @@ GLESv2_LIB_NAME = lib$(GLESv2_LIB).so VG_LIB_NAME = lib$(VG_LIB).so GLAPI_LIB_NAME = lib$(GLAPI_LIB).so WAYLAND_EGL_LIB_NAME = lib$(WAYLAND_EGL_LIB).so -GBM_LIB_NAME = lib$(GBM_LIB).so # globs used to install the lib and all symlinks GL_LIB_GLOB = $(GL_LIB_NAME)* @@ -89,7 +87,6 @@ GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* VG_LIB_GLOB = $(VG_LIB_NAME)* GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)* WAYLAND_EGL_LIB_GLOB = $(WAYLAND_EGL_LIB_NAME)* -GBM_LIB_GLOB = $(GBM_LIB_NAME)* DRI_CFLAGS = $(CFLAGS) DRI_CXXFLAGS = $(CXXFLAGS) @@ -113,9 +110,6 @@ DRIVER_DIRS = x11 osmesa # EGL drivers to build EGL_DRIVERS_DIRS = glx -# gbm backends to build -GBM_BACKEND_DIRS = dri - # Gallium directories and GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a @@ -141,7 +135,6 @@ GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -lwayland-client -ldrm -GBM_LIB_DEPS = $(EXTRA_LIB_PATH) -ludev -ldl # Program dependencies - specific GL libraries added in Makefiles X11_LIBS = -lX11 @@ -160,9 +153,6 @@ DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR) # EGL driver install directory EGL_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/egl -# gbm backend install directory -GBM_BACKEND_INSTALL_DIR = $(INSTALL_LIB_DIR)/gbm - # Xorg driver install directory (for xorg state-tracker) XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers @@ -192,6 +182,3 @@ VG_PC_CFLAGS = WAYLAND_EGL_PC_REQ_PRIV = WAYLAND_EGL_PC_LIB_PRIV = WAYLAND_EGL_PC_CFLAGS = -GBM_PC_REQ_PRIV = -GBM_PC_LIB_PRIV = -GBM_PC_CFLAGS = |