summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2019-06-15 09:18:42 +0200
committerUwe Klotz <uklotz@mixxx.org>2019-06-15 10:15:18 +0200
commit4883aa3f5a1b98da4abc69584c9f96449548f33a (patch)
tree6609b0dca0c5cc6272c9578630067c597de61991 /build
parentdb0eb83db2adf03ce0ef28a9534ef42c5914ce0d (diff)
Switch from C++11 to C++14
Diffstat (limited to 'build')
-rw-r--r--build/depends.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/build/depends.py b/build/depends.py
index bf1ae67cef..2243696ae7 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -443,10 +443,13 @@ class Qt(Dependence):
build.env.Append(LINKFLAGS=['-Wl,-rpath,%s' % libdir_path])
build.env.Append(LINKFLAGS="-L" + libdir_path)
- # Mixxx requires C++11 support. Windows enables C++11 features by
- # default but Clang/GCC require a flag.
- if not build.platform_is_windows:
- build.env.Append(CXXFLAGS='-std=c++11')
+ # Mixxx requires C++14 support
+ if build.platform_is_windows:
+ # MSVC
+ build.env.Append(CXXFLAGS='/std:c++14')
+ else:
+ # GCC/Clang
+ build.env.Append(CXXFLAGS='-std=c++14')
class TestHeaders(Dependence):