mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-21 10:53:23 +02:00
Merge pull request #3935 from zhaowenlan1779/revert-3773-master
Revert "CMake: Avoid non-compliant standard library extensions in MSVC"
This commit is contained in:
commit
3799b16207
@ -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.
|
||||||
|
Loading…
Reference in New Issue
Block a user