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

Merge pull request #3773 from kdex/master

Browse Source 
CMake: Avoid non-compliant standard library extensions in MSVC
This commit is contained in:
James Rowe
2018-05-31 23:07:28 -06:00
committed by GitHub
parent 489d5a3da9 513fffc96b
commit a3acb5129b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -120,6 +120,8 @@ 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.