mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-20 18:10:11 +01:00
swr: [configure.ac/scons] require c++14
New C++ features used by upcoming swr changes. Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
parent
e5fdfcf836
commit
3c52a7316a
3 changed files with 7 additions and 7 deletions
|
|
@ -2396,10 +2396,10 @@ if test -n "$with_gallium_drivers"; then
|
||||||
xswr)
|
xswr)
|
||||||
llvm_require_version $LLVM_REQUIRED_SWR "swr"
|
llvm_require_version $LLVM_REQUIRED_SWR "swr"
|
||||||
|
|
||||||
swr_require_cxx_feature_flags "C++11" "__cplusplus >= 201103L" \
|
swr_require_cxx_feature_flags "C++14" "__cplusplus >= 201402L" \
|
||||||
",-std=c++11" \
|
"-std=c++14" \
|
||||||
SWR_CXX11_CXXFLAGS
|
SWR_CXX14_CXXFLAGS
|
||||||
AC_SUBST([SWR_CXX11_CXXFLAGS])
|
AC_SUBST([SWR_CXX14_CXXFLAGS])
|
||||||
|
|
||||||
swr_require_cxx_feature_flags "AVX" "defined(__AVX__)" \
|
swr_require_cxx_feature_flags "AVX" "defined(__AVX__)" \
|
||||||
",-mavx,-march=core-avx" \
|
",-mavx,-march=core-avx" \
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
include Makefile.sources
|
include Makefile.sources
|
||||||
include $(top_srcdir)/src/gallium/Automake.inc
|
include $(top_srcdir)/src/gallium/Automake.inc
|
||||||
|
|
||||||
AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX11_CXXFLAGS)
|
AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX14_CXXFLAGS)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libmesaswr.la
|
noinst_LTLIBRARIES = libmesaswr.la
|
||||||
|
|
||||||
|
|
@ -32,7 +32,7 @@ COMMON_CXXFLAGS = \
|
||||||
-fno-strict-aliasing \
|
-fno-strict-aliasing \
|
||||||
$(GALLIUM_DRIVER_CFLAGS) \
|
$(GALLIUM_DRIVER_CFLAGS) \
|
||||||
$(LLVM_CXXFLAGS) \
|
$(LLVM_CXXFLAGS) \
|
||||||
$(SWR_CXX11_CXXFLAGS) \
|
$(SWR_CXX14_CXXFLAGS) \
|
||||||
-I$(builddir)/rasterizer/codegen \
|
-I$(builddir)/rasterizer/codegen \
|
||||||
-I$(builddir)/rasterizer/jitter \
|
-I$(builddir)/rasterizer/jitter \
|
||||||
-I$(builddir)/rasterizer/archrast \
|
-I$(builddir)/rasterizer/archrast \
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ loadersource = env.ParseSourceList('Makefile.sources', [
|
||||||
|
|
||||||
if not env['msvc'] :
|
if not env['msvc'] :
|
||||||
env.Append(CCFLAGS = [
|
env.Append(CCFLAGS = [
|
||||||
'-std=c++11',
|
'-std=c++14',
|
||||||
])
|
])
|
||||||
|
|
||||||
swrroot = '#src/gallium/drivers/swr/'
|
swrroot = '#src/gallium/drivers/swr/'
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue