diff --git a/projects/msvc/GLideN64.vcxproj b/projects/msvc/GLideN64.vcxproj
index 66435e12..4c466f1b 100644
--- a/projects/msvc/GLideN64.vcxproj
+++ b/projects/msvc/GLideN64.vcxproj
@@ -251,6 +251,30 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")
../../src/inc/freetype/include;%(AdditionalIncludeDirectories)
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
+ true
+ stdcpp17
@@ -558,4 +582,4 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")
-
\ No newline at end of file
+
diff --git a/projects/msvc/GLideN64.vcxproj.filters b/projects/msvc/GLideN64.vcxproj.filters
index 9209c2e6..c514ca90 100644
--- a/projects/msvc/GLideN64.vcxproj.filters
+++ b/projects/msvc/GLideN64.vcxproj.filters
@@ -146,7 +146,7 @@
Source Files\windows
-
+
Source Files\windows
@@ -793,4 +793,4 @@
Resource Files
-
\ No newline at end of file
+
diff --git a/projects/msvc/GLideNUI-wtl.vcxproj b/projects/msvc/GLideNUI-wtl.vcxproj
index 6d709494..68777d96 100644
--- a/projects/msvc/GLideNUI-wtl.vcxproj
+++ b/projects/msvc/GLideNUI-wtl.vcxproj
@@ -75,6 +75,8 @@
Disabled
MultiThreadedDebug
true
+ stdcpp17
+ stdcpp17
@@ -83,6 +85,8 @@
MaxSpeed
MultiThreaded
false
+ stdcpp17
+ stdcpp17
true
diff --git a/projects/msvc/GLideNUI.vcxproj b/projects/msvc/GLideNUI.vcxproj
index 7e3bf6f9..9fad79a5 100644
--- a/projects/msvc/GLideNUI.vcxproj
+++ b/projects/msvc/GLideNUI.vcxproj
@@ -78,6 +78,10 @@
Disabled
MultiThreadedDebug
true
+ true
+ stdcpp17
+ true
+ stdcpp17
qtpcre2d.lib;qtmaind.lib;qwindowsd.lib;qicod.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;UxTheme.lib;qwindowsvistastyled.lib;Qt5WindowsUiAutomationSupportd.lib;Qt5FontDatabaseSupportd.lib;Qt5EventDispatcherSupportd.lib;Qt5FontDatabaseSupportd.lib;Qt5ThemeSupportd.lib;qtharfbuzzd.lib;Ws2_32.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Wtsapi32.lib;Imm32.lib;WinMM.lib;Version.lib;Netapi32.lib;Dwmapi.lib;%(AdditionalDependencies)
@@ -93,6 +97,10 @@
MaxSpeed
MultiThreaded
false
+ true
+ stdcpp17
+ true
+ stdcpp17
qtpcre2.lib;qtmain.lib;qwindows.lib;qico.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;UxTheme.lib;qwindowsvistastyle.lib;Qt5WindowsUiAutomationSupport.lib;Qt5FontDatabaseSupport.lib;Qt5EventDispatcherSupport.lib;Qt5FontDatabaseSupport.lib;Qt5ThemeSupport.lib;qtharfbuzz.lib;Ws2_32.lib;Netapi32.lib;Userenv.lib;Ws2_32.lib;Wtsapi32.lib;Imm32.lib;WinMM.lib;Version.lib;Netapi32.lib;Dwmapi.lib;%(AdditionalDependencies)
diff --git a/projects/msvc/GLideNUI.vcxproj.filters b/projects/msvc/GLideNUI.vcxproj.filters
index c0508e0d..5692efed 100644
--- a/projects/msvc/GLideNUI.vcxproj.filters
+++ b/projects/msvc/GLideNUI.vcxproj.filters
@@ -90,6 +90,9 @@
Source Files
+
+ Generated Files\Debug
+
diff --git a/projects/msvc/libGLideNHQ.vcxproj b/projects/msvc/libGLideNHQ.vcxproj
index 7ca533c7..bb1e04ed 100644
--- a/projects/msvc/libGLideNHQ.vcxproj
+++ b/projects/msvc/libGLideNHQ.vcxproj
@@ -85,11 +85,23 @@
lib/msvc12/dbg
lib/dbg
+
+ true
+
+
+ stdcpp17
+
lib/x64/dbg
+
+ true
+
+
+ stdcpp17
+
@@ -110,11 +122,23 @@
lib/msvc12/rel
lib/rel
+
+ true
+
+
+ stdcpp17
+
lib/x64/rel
+
+ true
+
+
+ stdcpp17
+
diff --git a/projects/msvc/osal.vcxproj b/projects/msvc/osal.vcxproj
index b14e49ce..29b11327 100644
--- a/projects/msvc/osal.vcxproj
+++ b/projects/msvc/osal.vcxproj
@@ -64,6 +64,10 @@
Disabled
MultiThreadedDebug
+ true
+ stdcpp17
+ true
+ stdcpp17
@@ -72,6 +76,10 @@
true
true
MultiThreaded
+ true
+ stdcpp17
+ true
+ stdcpp17
true
diff --git a/projects/msvc/ticpp.vcxproj b/projects/msvc/ticpp.vcxproj
index f5a5604d..e2424b16 100644
--- a/projects/msvc/ticpp.vcxproj
+++ b/projects/msvc/ticpp.vcxproj
@@ -69,6 +69,8 @@
Level3
Disabled
TIXML_USE_TICPP;_WINDOWS;WIN32;_DEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
+ true
+ stdcpp17
Windows
@@ -79,6 +81,8 @@
Level3
Disabled
TIXML_USE_TICPP;_WINDOWS;WIN32;_DEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
+ true
+ stdcpp17
Windows
@@ -91,6 +95,8 @@
true
true
TIXML_USE_TICPP;_WINDOWS;WIN32;NDEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
+ true
+ stdcpp17
Windows
@@ -105,6 +111,8 @@
true
true
TIXML_USE_TICPP;_WINDOWS;WIN32;NDEBUG;_LIB;TIXML_USE_TICPP;%(PreprocessorDefinitions)
+ true
+ stdcpp17
Windows
diff --git a/projects/msvc/ts2lang.vcxproj b/projects/msvc/ts2lang.vcxproj
index 0107fe31..f7d4bc13 100644
--- a/projects/msvc/ts2lang.vcxproj
+++ b/projects/msvc/ts2lang.vcxproj
@@ -63,6 +63,8 @@
Level3
Disabled
_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)
+ true
+ stdcpp17
true
@@ -73,6 +75,8 @@
Level3
Disabled
_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)
+ true
+ stdcpp17
true
@@ -85,6 +89,8 @@
true
true
_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;%(PreprocessorDefinitions)
+ true
+ stdcpp17
true
@@ -98,6 +104,8 @@
true
true
_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)
+ true
+ stdcpp17
true
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9869a0fe..63f0722e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -489,7 +489,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQ
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_STATIC_LINK_FLAGS}" )
endif()
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
add_library( ${GLideN64_DLL_NAME} SHARED ${GLideN64_SOURCES} ${PATH_REVISION})
diff --git a/src/GLideNUI-wtl/WTL/atlapp.h b/src/GLideNUI-wtl/WTL/atlapp.h
index 742a6f68..726935c0 100644
--- a/src/GLideNUI-wtl/WTL/atlapp.h
+++ b/src/GLideNUI-wtl/WTL/atlapp.h
@@ -1638,7 +1638,7 @@ public:
}
// COM Server methods
- LONG Unlock()
+ LONG Unlock() throw()
{
LONG lRet = CComModule::Unlock();
if(lRet == 0)
diff --git a/src/GLideNUI-wtl/util/md5.h b/src/GLideNUI-wtl/util/md5.h
index 0bc66485..ac8842b7 100644
--- a/src/GLideNUI-wtl/util/md5.h
+++ b/src/GLideNUI-wtl/util/md5.h
@@ -78,7 +78,7 @@ struct MD5Digest
}
};
-struct MD5Digest_less : std::binary_function < MD5Digest, MD5Digest, bool >
+struct MD5Digest_less
{
bool operator()(const MD5Digest& x, const MD5Digest& y) const
{