From d4fbebf47896d180bc197c12284b223f1c57e2de Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Thu, 31 Mar 2022 18:50:09 +0200
Subject: [PATCH] Lower MSVC warning level to 2 (significant), enable WAE on CI

---
 .github/workflows/build.yml | 6 ------
 CMakeLists.txt              | 5 ++---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b48c493ba..19118f6a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,9 +125,6 @@ jobs:
         export CMAKE_EXTRA_ARGS=()
         if [ '${{ matrix.config.compiler }}' == 'msvc' ]; then
           CMAKE_EXTRA_ARGS+=('-DCMAKE_GENERATOR_PLATFORM=${{ steps.windows-identify.outputs.msvc-target }}')
-
-          # FIXME We don't want all the MSVC warnings to cause errors yet
-          export USE_WAE=OFF
         elif [ '${{ matrix.config.compiler }}' == 'mingw' ]; then
           CMAKE_EXTRA_ARGS+=('-DCMAKE_TOOLCHAIN_FILE=scripts/Cross-MinGW-${{ steps.windows-identify.outputs.mingw-target }}.cmake')
         else
@@ -180,9 +177,6 @@ jobs:
         if [ '${{ matrix.config.compiler }}' == 'msvc' ]; then
           CMAKE_EXTRA_ARGS+=('-DCMAKE_GENERATOR_PLATFORM=${{ steps.windows-identify.outputs.msvc-target }}')
 
-          # FIXME We don't want all the MSVC warnings to cause errors yet
-          export USE_WAE=OFF
-
           # Force static linking
           # 1. Make MSVC runtime configurable
           CMAKE_EXTRA_ARGS+=('-DCMAKE_POLICY_DEFAULT_CMP0091=NEW')
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 769842f33..3f23e102f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -457,9 +457,8 @@ if (NOT MSVC)
     list(APPEND WARNING_FLAGS -Werror)
   endif()
 else()
-  # /wd4100 == -Wno-unused-parameter
-  add_compile_options("/source-charset:utf-8")
-  set(WARNING_FLAGS /W4 /wd4100 /D_CRT_SECURE_NO_WARNINGS)
+  add_compile_options("/utf-8")
+  set(WARNING_FLAGS /W2 /D_CRT_SECURE_NO_WARNINGS)
   if (WARNINGS_ARE_ERRORS)
     list(APPEND WARNING_FLAGS /WX)
   endif()