summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2015-02-27 15:48:06 -0800
committerKenneth Graunke <[email protected]>2015-02-27 16:13:10 -0800
commit982723dfa20386b40ab2876fb134217cba42a934 (patch)
treee06e729a2d7c91b4a1e0e6de3630857af7b344d8 /src
parent7983a3d2e06b0bc16c1a16bddccc7f14fe1f132c (diff)
Revert "configure: Leverage gcc warn options to enable safe use of C99 features where possible."
This reverts commit 79daa510c7a871a33797308a2ccb4b83a067ffbe. I apparently hadn't done a clean build when testing this; it broke the build for Tom, Ben, and myself. We like the idea; let's try a v2.
Diffstat (limited to 'src')
-rw-r--r--src/egl/main/Makefile.am1
-rw-r--r--src/gallium/auxiliary/Makefile.am7
-rw-r--r--src/gallium/drivers/llvmpipe/Makefile.am6
-rw-r--r--src/gallium/state_trackers/egl/Makefile.am3
-rw-r--r--src/gallium/targets/egl-static/Makefile.am3
-rw-r--r--src/glsl/Makefile.am8
-rw-r--r--src/loader/Makefile.am1
-rw-r--r--src/mapi/Makefile.am4
-rw-r--r--src/mesa/Makefile.am10
-rw-r--r--src/util/Makefile.am3
10 files changed, 12 insertions, 34 deletions
diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index a4db21016e9..d21d8a9eb5a 100644
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -26,7 +26,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/gbm/main \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS) \
$(EGL_CFLAGS) \
-D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
-D_EGL_DRIVER_SEARCH_DIR=\"$(libdir)/egl\" \
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 27a8b3fe420..4b6205797ef 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -12,12 +12,9 @@ noinst_LTLIBRARIES = libgallium.la
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary/util \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
- $(MSVC2008_COMPAT_CXXFLAGS)
+ $(VISIBILITY_CFLAGS)
-AM_CXXFLAGS = \
- $(VISIBILITY_CXXFLAGS) \
- $(MSVC2008_COMPAT_CXXFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
libgallium_la_SOURCES = \
$(C_SOURCES) \
diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
index 1d3853e41a6..0bd4282632a 100644
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -25,12 +25,10 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_DRIVER_CFLAGS) \
- $(LLVM_CFLAGS) \
- $(MSVC2008_COMPAT_CFLAGS)
+ $(LLVM_CFLAGS)
AM_CXXFLAGS= \
$(GALLIUM_DRIVER_CXXFLAGS) \
- $(LLVM_CXXFLAGS) \
- $(MSVC2008_COMPAT_CXXFLAGS)
+ $(LLVM_CXXFLAGS)
noinst_LTLIBRARIES = libllvmpipe.la
diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index f13fcb2ccb8..31546a778cf 100644
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -27,8 +27,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS)
+ $(VISIBILITY_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/src/egl/main \
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 51c3f052acd..85f2ac1b785 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -31,8 +31,7 @@
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
- $(GALLIUM_TARGET_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS)
+ $(GALLIUM_TARGET_CFLAGS)
AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/state_trackers/egl \
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index b466a3b5c52..5a0a643daf2 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -33,12 +33,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gtest/include \
-I$(top_builddir)/src/glsl/nir \
$(DEFINES)
-AM_CFLAGS = \
- $(VISIBILITY_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS)
-AM_CXXFLAGS = \
- $(VISIBILITY_CXXFLAGS) \
- $(MSVC2013_COMPAT_CXXFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
EXTRA_DIST = tests glcpp/tests README TODO glcpp/README \
glsl_lexer.ll \
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 3d32279ea26..36ddba82bd3 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -30,7 +30,6 @@ libloader_la_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
$(VISIBILITY_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS) \
$(LIBUDEV_CFLAGS)
libloader_la_SOURCES = $(LOADER_C_FILES)
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index b0a6c8ca2d8..67946829198 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -39,9 +39,7 @@ EXTRA_DIST = \
glapi/SConscript \
shared-glapi/SConscript
-AM_CFLAGS = \
- $(PTHREAD_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS)
+AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS = \
$(DEFINES) \
$(SELINUX_CFLAGS) \
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 5e9a82098fb..b6cb8f1117b 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -136,14 +136,8 @@ noinst_LTLIBRARIES += libmesagallium.la
endif
AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
-AM_CFLAGS = \
- $(LLVM_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
- $(MSVC2013_COMPAT_CFLAGS)
-AM_CXXFLAGS = \
- $(LLVM_CFLAGS) \
- $(VISIBILITY_CXXFLAGS) \
- $(MSVC2013_COMPAT_CXXFLAGS)
+AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
ARCH_LIBS =
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 29b66e70e9d..9af233059bb 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -34,8 +34,7 @@ libmesautil_la_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
$(SHA1_CFLAGS) \
- $(VISIBILITY_CFLAGS) \
- $(MSVC2008_COMPAT_CFLAGS)
+ $(VISIBILITY_CFLAGS)
libmesautil_la_SOURCES = \
$(MESA_UTIL_FILES) \