diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2019-05-09 00:18:14 +0200 |
|---|---|---|
| committer | spycrab <spycrab@users.noreply.github.com> | 2019-05-12 00:44:02 +0200 |
| commit | c8795f799eacfbc9de96da5b384e6ecaec8f0290 (patch) | |
| tree | 5c926f40e8e8c8ba8d50f288d0dcb594f7e88040 /Source | |
| parent | 1121a04718ee4751a0c8c56fe40905246c273c4e (diff) | |
Core/CMake: Silence some warnings
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Source/Core/Core/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 2563a618c1..8d6f475fe2 100644 --- 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) - add_definitions(/utf-8) + # All files are encoded as 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 index 4a9a0e7b74..7c2f06ff2b 100644 --- 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 |