Merge branch 'master' into kimkulling/fix_sample_utf8_encoding

samples/SimpleTexturedDirectx11/CMakeLists.txt

@@ -8,6 +8,9 @@ if ( MSVC )
   ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
   ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
   REMOVE_DEFINITIONS( -DUNICODE -D_UNICODE )
+  if ( MSVC_VERSION GREATER_EQUAL 1930 )
+    ADD_DEFINITIONS( -D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING=1 )
+  endif ()
 endif ()
 
 ADD_COMPILE_DEFINITIONS(SHADER_PATH="${CMAKE_CURRENT_SOURCE_DIR}/SimpleTexturedDirectx11/")