Bump project to cpp17

edo9300 · Nov 24, 2023 · 89c372e · 89c372e
1 parent ea60cce
commit 89c372e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/jni/Application.mk b/jni/Application.mk
@@ -2,5 +2,5 @@ APP_ABI := armeabi-v7a arm64-v8a x86
 APP_PLATFORM := android-16
 APP_ALLOW_MISSING_DEPS=true
 APP_STL := c++_static
-APP_CPPFLAGS := -std=c++14
+APP_CPPFLAGS := -std=c++1z
 APP_OPTIM := release
diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('ocgcore', 'cpp',
 	license : 'AGPL-3.0-or-later',
-	default_options : ['cpp_std=c++14'],
+	default_options : ['cpp_std=c++17'],
 	version : '9.1'
 )
 

diff --git a/premake5.lua b/premake5.lua
@@ -2,7 +2,7 @@ local ocgcore_config=function()
 	files { "*.h", "*.cpp" }
 	warnings "Extra"
 	optimize "Speed"
-	cppdialect "C++14"
+	cppdialect "C++17"
 
 	filter "action:not vs*"
 		buildoptions { "-Wno-unused-parameter", "-pedantic" }
@@ -34,11 +34,8 @@ if not subproject then
 		architecture "x64"
 
 	if _OPTIONS["oldwindows"] then
-		filter { "action:vs2015" }
-			toolset "v140_xp"
-		filter { "action:not vs2015" }
-			toolset "v141_xp"
 		filter {}
+			toolset "v141_xp"
 	end
 
 	filter "action:vs*"