diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
| commit | 01102cdf33d68a7be192a139752831ff93dee117 (patch) | |
| tree | 84cc702a6d5bb77647f6df3840b41eb9a7b9faf4 /mesalib/configs/current.in | |
| parent | dcf9ae77854778629cabd0d6943dda3678eb91fa (diff) | |
| parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
| download | vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.gz vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.bz2 vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/configs/current.in')
| -rw-r--r-- | mesalib/configs/current.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/configs/current.in b/mesalib/configs/current.in index f4858bdfa..dc0dea835 100644 --- a/mesalib/configs/current.in +++ b/mesalib/configs/current.in @@ -47,7 +47,6 @@ DLOPEN_LIBS = @DLOPEN_LIBS@ # Source selection MESA_ASM_FILES = @MESA_ASM_FILES@ -GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@ # Misc tools and flags MAKE = @MAKE@ @@ -147,8 +146,8 @@ VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@ GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@ # DRI dependencies -MESA_MODULES = @MESA_MODULES@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@ +GALLIUM_DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @GALLIUM_DRI_LIB_DEPS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIB = @LIBDRM_LIBS@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ |