diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-31 10:17:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-31 10:17:14 +0200 |
| commit | 83da3ad0287bc51cd16ee6911fe73dc98ebe000b (patch) | |
| tree | 48d48590a0b0a3770006aeda8ec2b2a45054d1f1 /mesalib/configs | |
| parent | 00e30605ffc7ac3cf1a091ff2c1f46cfefb780d7 (diff) | |
| parent | bd27b3d008b0abf9ae2edcb127302728808533e4 (diff) | |
| download | vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.tar.gz vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.tar.bz2 vcxsrv-83da3ad0287bc51cd16ee6911fe73dc98ebe000b.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configs')
| -rw-r--r-- | mesalib/configs/current.in | 7 | ||||
| -rw-r--r-- | mesalib/configs/default | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mesalib/configs/current.in b/mesalib/configs/current.in index dc0dea835..c4f3f4df9 100644 --- a/mesalib/configs/current.in +++ b/mesalib/configs/current.in @@ -9,16 +9,14 @@ CONFIG_NAME = autoconf # Compiler and flags CC = @CC@ CXX = @CXX@ -OPT_FLAGS = @OPT_FLAGS@ -ARCH_FLAGS = @ARCH_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) $(DEFINES) + $(PIC_FLAGS) $(DEFINES) CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ - $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) + $(PIC_FLAGS) $(DEFINES) CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@ CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@ LDFLAGS = @LDFLAGS@ @@ -99,7 +97,6 @@ GLAPI_LIB_NAME = @GLAPI_LIB_NAME@ GL_LIB_GLOB = @GL_LIB_GLOB@ GLU_LIB_GLOB = @GLU_LIB_GLOB@ GLW_LIB_GLOB = @GLW_LIB_GLOB@ -OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@ EGL_LIB_GLOB = @EGL_LIB_GLOB@ GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@ GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@ diff --git a/mesalib/configs/default b/mesalib/configs/default index 734b2f62e..8a8d8f8d2 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -76,7 +76,6 @@ GLAPI_LIB_NAME = lib$(GLAPI_LIB).so GL_LIB_GLOB = $(GL_LIB_NAME)* GLU_LIB_GLOB = $(GLU_LIB_NAME)* GLW_LIB_GLOB = $(GLW_LIB_NAME)* -OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)* EGL_LIB_GLOB = $(EGL_LIB_NAME)* GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* |