diff --git a/gframe/premake5.lua b/gframe/premake5.lua
index e3e121ffb..8befcc3f0 100644
--- a/gframe/premake5.lua
+++ b/gframe/premake5.lua
@@ -4,7 +4,7 @@ if _ACTION=="xcode4" then
 end
 local ygopro_config=function(static_core)
 	kind "WindowedApp"
-	cppdialect "C++14"
+	cppdialect "C++17"
 	rtti "Off"
 	files { "**.cpp", "**.cc", "**.c", "**.h", "**.hpp" }
 	excludes { "lzma/**", "sound_sdlmixer.*", "sound_irrklang.*", "irrklang_dynamic_loader.*", "sound_sfml.*", "sfAudio/**", "Android/**" }
diff --git a/gframe/text_types.h b/gframe/text_types.h
index 467f8d742..27379a8d5 100644
--- a/gframe/text_types.h
+++ b/gframe/text_types.h
@@ -2,6 +2,7 @@
 #define TEXT_TYPES_H_
 #include <string>
 #include "fmt.h"
+#define nssv_CONFIG_SELECT_STRING_VIEW 1
 #include "nonstd/string_view.hpp"
 
 // Double macro to convert the macro-defined int to a character literal
diff --git a/premake5.lua b/premake5.lua
index e2dee1e99..235f23a7f 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -194,9 +194,7 @@ workspace "ygo"
 	end
 
 	if _OPTIONS["oldwindows"] then
-		filter { "action:vs2015" }
-			toolset "v140_xp"
-		filter { "action:vs*", "action:not vs2015" }
+		filter { "action:vs*" }
 			toolset "v141_xp"
 		filter {}
 	else