Commit 3cc0aeae by Ben Clayton

Build: Move from using C++11 to C++14.

Bug: b/147359661 Change-Id: Ieb2de4d93ca617b190977e258023992f4a6d34c9 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39948Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarBen Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent bfd8c70a
......@@ -18,7 +18,7 @@
"${workspaceFolder}/third_party/cppdap/include"
],
"cStandard": "c11",
"cppStandard": "c++11"
"cppStandard": "c++14"
},
{
"name": "Mac",
......@@ -38,7 +38,7 @@
"${workspaceFolder}/third_party/cppdap/include"
],
"cStandard": "c11",
"cppStandard": "c++11"
"cppStandard": "c++14"
},
{
"name": "Win32",
......@@ -58,7 +58,7 @@
"${workspaceFolder}/third_party/cppdap/include"
],
"cStandard": "c11",
"cppStandard": "c++11"
"cppStandard": "c++14"
}
],
"version": 4
......
......@@ -32,7 +32,7 @@ cc_defaults {
"-DVK_USE_PLATFORM_ANDROID_KHR",
"-DVK_EXPORT= ",
],
cpp_std: "c++11",
cpp_std: "c++14",
target: {
host: {
......
......@@ -60,7 +60,7 @@ config("swiftshader_config") {
}
} else {
cflags = [
"-std=c++11",
"-std=c++14",
"-fno-exceptions",
"-fno-operator-names",
]
......
cmake_minimum_required(VERSION 3.6.3)
set(CMAKE_CXX_STANDARD 14)
project(SwiftShader C CXX ASM)
# On Windows we use custom solution and project files, except for certain third-
......@@ -360,7 +362,6 @@ if(MSVC)
)
else()
set_cpp_flag("--std=c++11")
set_cpp_flag("-fno-exceptions")
list(APPEND SWIFTSHADER_COMPILE_OPTIONS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment