midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3935 from zhaowenlan1779/revert-3773-master

Browse Source 
Revert "CMake: Avoid non-compliant standard library extensions in MSVC"
This commit is contained in:
Weiyi Wang 2018-07-13 20:03:54 +03:00 committed by GitHub
commit 3799b16207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -120,8 +120,6 @@ if (NOT MSVC)
else() else()
# Silence "deprecation" warnings # Silence "deprecation" warnings
add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_WARNINGS) add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_WARNINGS)
# Avoid non-compliant standard library extensions
add_definitions(/D_CRT_DECLARE_NONSTDC_NAMES)
# Avoid windows.h junk # Avoid windows.h junk
add_definitions(/DNOMINMAX) add_definitions(/DNOMINMAX)
# Avoid windows.h from including some usually unused libs like winsocks.h, since this might cause some redefinition errors. # Avoid windows.h from including some usually unused libs like winsocks.h, since this might cause some redefinition errors.