diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a2ba9f..67e179d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,8 +126,8 @@ string(TIMESTAMP PROJECT_COMPILE_DATETIME UTC)
 if(MSVC)
     string(REGEX REPLACE "[-|/]GR-? " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
     string(REGEX REPLACE "[-|/]EHs-?c-? " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-    string(APPEND CMAKE_CXX_FLAGS " /GR ")
-    string(APPEND CMAKE_CXX_FLAGS " /EHsc ")
+    string(REGEX REPLACE "[-|/]W[0|1|2|3|4|all] " " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    string(APPEND CMAKE_CXX_FLAGS " /GR /EHsc /W4 ")
     set(CMAKE_RC_FLAGS "/c65001 /DWIN32 /nologo")
     if(MSVC_VERSION GREATER_EQUAL 1920) # Visual Studio 2019 version 16.0
         string(REGEX REPLACE "[-|/]Ob[0|1|2|3] " " " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
diff --git a/src/core/cmakehelper.cmake b/src/core/cmakehelper.cmake
index 0a8df4e..61a1691 100644
--- a/src/core/cmakehelper.cmake
+++ b/src/core/cmakehelper.cmake
@@ -67,7 +67,7 @@ function(setup_compile_params arg_target)
         )
         target_compile_options(${arg_target} PRIVATE
             /bigobj /utf-8 $<$<NOT:$<CONFIG:Debug>>:/fp:fast /GT /Gw /Gy /guard:cf /Zc:inline>
-            /sdl /Zc:auto /Zc:forScope /Zc:implicitNoexcept /Zc:noexceptTypes /Zc:referenceBinding
+            /Zc:auto /Zc:forScope /Zc:implicitNoexcept /Zc:noexceptTypes /Zc:referenceBinding
             /Zc:rvalueCast /Zc:sizedDealloc /Zc:strictStrings /Zc:throwingNew /Zc:trigraphs
             /Zc:wchar_t
         )