summaryrefslogtreecommitdiffstats
path: root/packaging/windows
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-10-18 00:08:38 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-24 15:21:55 -0700
commit1211520ca939e53d6880e213dd38053a08b9589e (patch)
treed76eee0177ff0433baede06a99427087b1741dd9 /packaging/windows
parentb7a586a5b45477b8728301977ad1855234ca6b6b (diff)
downloadsubsurface-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/windows')
-rwxr-xr-xpackaging/windows/mxe-based-build.sh2
-rwxr-xr-xpackaging/windows/smtk2ssrf-mxe-build.sh2
2 files changed, 2 insertions, 2 deletions
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"