diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0e641d1c..41919c8b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,6 +247,7 @@ set(STRICT_OPTIONS_CXX )
 set(STRICT_OPTIONS_OBJC )
 if(MSVC)
 	list(APPEND STRICT_OPTIONS_CPP "/wd4995") # Disable "name was marked as #pragma deprecated" warnings
+	list(APPEND STRICT_OPTIONS_CPP "/wd4996") # Disable deprecated function warnings
 	if(ENABLE_STRICT)
 		list(APPEND STRICT_OPTIONS_CPP "/WX")
 	endif()
@@ -267,9 +268,6 @@ else()
 		list(APPEND STRICT_OPTIONS_CPP "-Werror" "-Wextra" "-Wno-unused-parameter" "-Wno-missing-field-initializers" "-fno-strict-aliasing")
 	endif()
 endif()
-if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-	list(APPEND STRICT_OPTIONS_CPP "/wd4996")
-endif()
 if(STRICT_OPTIONS_CPP)
 	list(REMOVE_DUPLICATES STRICT_OPTIONS_CPP)
 endif()