Core/CMake: Silence some warnings

dolphin-emu · May 11, 2019 · c8795f7 · c8795f7
1 parent 1121a04
commit c8795f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -7,6 +7,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_definitions(-D_SCL_SECURE_NO_WARNINGS)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+  add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
 endif()
 
 set(CMAKE_CXX_STANDARD 17)
@@ -42,8 +43,9 @@ if (MSVC)
   # Treat all warnings as errors
   add_compile_options(/WX)
 
-  add_definitions(/D _CRT_NONSTDC_NO_WARNINGS)
+  # All files are encoded as UTF-8
-  add_definitions(/utf-8)
+  add_compile_options(/utf-8)
+
 endif()
 
 # These aren't actually needed for C11/C++11

diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
@@ -343,6 +343,7 @@ if(WIN32)
     setupapi.lib
     iphlpapi.lib
   )
+  target_compile_definitions(core PRIVATE "-D_WINSOCK_DEPRECATED_NO_WARNINGS")
 elseif(APPLE)
   target_sources(core PRIVATE
     HW/EXI/BBA-TAP/TAP_Apple.cpp