diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-22 08:30:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-22 08:30:33 +0200 |
| commit | e1a407256a5c1571d8f4871fd981a51cfbd46e37 (patch) | |
| tree | 9f8327deb05890b77137d57c0416d392beaa7fac /mesalib/configs | |
| parent | da6ea6d64418710cbf7e0639dfefd2d856d53f1a (diff) | |
| download | vcxsrv-e1a407256a5c1571d8f4871fd981a51cfbd46e37.tar.gz vcxsrv-e1a407256a5c1571d8f4871fd981a51cfbd46e37.tar.bz2 vcxsrv-e1a407256a5c1571d8f4871fd981a51cfbd46e37.zip | |
mesa xserver libxcb fontconfig
Diffstat (limited to 'mesalib/configs')
| -rw-r--r-- | mesalib/configs/current.in (renamed from mesalib/configs/autoconf.in) | 7 | ||||
| -rw-r--r-- | mesalib/configs/default | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/current.in index 48f4504a2..f4858bdfa 100644 --- a/mesalib/configs/autoconf.in +++ b/mesalib/configs/current.in @@ -11,13 +11,12 @@ CC = @CC@ CXX = @CXX@ OPT_FLAGS = @OPT_FLAGS@ ARCH_FLAGS = @ARCH_FLAGS@ -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) + $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@ @@ -42,8 +41,6 @@ LLVM_LIBS = @LLVM_LIBS@ LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@ GLW_CFLAGS = @GLW_CFLAGS@ GLX_TLS = @GLX_TLS@ -DRI_CFLAGS = @DRI_CFLAGS@ -DRI_CXXFLAGS = @DRI_CXXFLAGS@ # dlopen DLOPEN_LIBS = @DLOPEN_LIBS@ @@ -125,8 +122,6 @@ GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drive # Driver specific build vars DRI_DIRS = @DRI_DIRS@ -DRICORE_LIBS = @DRICORE_LIBS@ -DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@ EGL_PLATFORMS = @EGL_PLATFORMS@ EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ diff --git a/mesalib/configs/default b/mesalib/configs/default index 20ba79642..734b2f62e 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -19,11 +19,9 @@ DRM_SOURCE_PATH=$(TOP)/../drm # Compiler and flags CC = cc CXX = CC -HOST_CC = $(CC) CFLAGS = -O CXXFLAGS = -O LDFLAGS = -HOST_CFLAGS = $(CFLAGS) GLU_CFLAGS = GLX_TLS = no @@ -85,9 +83,6 @@ GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* VG_LIB_GLOB = $(VG_LIB_NAME)* GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)* -DRI_CFLAGS = $(CFLAGS) -DRI_CXXFLAGS = $(CXXFLAGS) - # Optional assembly language optimization files for libGL MESA_ASM_FILES = |