Index: build/premake/premake5.lua =================================================================== --- build/premake/premake5.lua +++ build/premake/premake5.lua @@ -199,11 +199,11 @@ -- being used as a DLL (which is currently not the case in 0ad) defines { "LIB_STATIC_LINK" } - -- Enable C++14 standard. + -- Enable C++17 standard. filter "action:vs*" - buildoptions { "/std:c++14" } + buildoptions { "/std:c++17" } filter "action:not vs*" - buildoptions { "-std=c++14" } + buildoptions { "-std=c++17" } filter {} -- various platform-specific build flags Index: libraries/osx/build-osx-libs.sh =================================================================== --- libraries/osx/build-osx-libs.sh +++ libraries/osx/build-osx-libs.sh @@ -28,7 +28,7 @@ # NOTE: remember to also update LIB_URL below when changing version BOOST_VERSION="boost_1_74_0" # NOTE: remember to also update LIB_URL below when changing version -WXWIDGETS_VERSION="wxWidgets-3.0.3.1" +WXWIDGETS_VERSION="wxWidgets-3.0.5.1" # libpng was included as part of X11 but that's removed from Mountain Lion # (also the Snow Leopard version was ancient 1.2) PNG_VERSION="libpng-1.6.36" @@ -86,7 +86,7 @@ fi CFLAGS="$CFLAGS $C_FLAGS -fvisibility=hidden" -CXXFLAGS="$CXXFLAGS $C_FLAGS -stdlib=libc++ -std=c++14 -msse4.1" +CXXFLAGS="$CXXFLAGS $C_FLAGS -stdlib=libc++ -std=c++17 -msse4.1" OBJCFLAGS="$OBJCFLAGS $C_FLAGS" OBJCXXFLAGS="$OBJCXXFLAGS $C_FLAGS" @@ -397,7 +397,7 @@ LIB_VERSION="${WXWIDGETS_VERSION}" LIB_ARCHIVE="$LIB_VERSION.tar.bz2" LIB_DIRECTORY="$LIB_VERSION" -LIB_URL="http://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3.1/" +LIB_URL="http://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5.1/" mkdir -p wxwidgets pushd wxwidgets > /dev/null @@ -427,6 +427,7 @@ --without-libtiff --without-sdl --without-x + --disable-stc --disable-webview --disable-webkit --disable-webviewwebkit