diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-18 00:08:38 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-24 15:21:55 -0700 |
| commit | 1211520ca939e53d6880e213dd38053a08b9589e (patch) | |
| tree | d76eee0177ff0433baede06a99427087b1741dd9 /packaging | |
| parent | b7a586a5b45477b8728301977ad1855234ca6b6b (diff) | |
| download | subsurface-1211520ca939e53d6880e213dd38053a08b9589e.tar.gz | |
build-system: switch to using C++17 as default C++ dialect
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 2 | ||||
| -rwxr-xr-x | packaging/windows/mxe-based-build.sh | 2 | ||||
| -rwxr-xr-x | packaging/windows/smtk2ssrf-mxe-build.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index 7a6498ebd..e9c81dfb2 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -4,7 +4,7 @@ QT += qml quick quickcontrols2 widgets positioning concurrent svg bluetooth DEFINES += SUBSURFACE_MOBILE BT_SUPPORT BLE_SUPPORT -CONFIG += c++11 +CONFIG += c++17 QMAKE_TARGET_BUNDLE_PREFIX = org.subsurface-divelog QMAKE_BUNDLE = subsurface-mobile diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index d15b90c12..ecae2e7e8 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -114,7 +114,7 @@ fi echo "Building in $BUILDDIR ..." export PATH="$BASEDIR"/"$MXEDIR"/usr/bin:$PATH:"$BASEDIR"/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/ -export CXXFLAGS=-std=c++11 +export CXXFLAGS=-std=c++17 if [[ "$1" == "debug" ]] ; then RELEASE="Debug" diff --git a/packaging/windows/smtk2ssrf-mxe-build.sh b/packaging/windows/smtk2ssrf-mxe-build.sh index a1db2a05c..858075ad2 100755 --- a/packaging/windows/smtk2ssrf-mxe-build.sh +++ b/packaging/windows/smtk2ssrf-mxe-build.sh @@ -136,7 +136,7 @@ case "$RELEASE" in esac export PATH="$BASEDIR"/mxe/usr/bin:$PATH:"$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/bin/ -export CXXFLAGS=-std=c++11 +export CXXFLAGS=-std=c++17 export PKG_CONFIG_PATH_i686_w64_mingw32_static="$BASEDIR/mxe/usr/i686-w64-mingw32.static/lib/pkgconfig" export PKG_CONFIG_PATH_i686_w64_mingw32_shared="$BASEDIR/mxe/usr/i686-w64-mingw32.shared/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH_i686_w64_mingw32_static":"$PKG_CONFIG_PATH_i686_w64_mingw32_shared" |