citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Set global definition WIN32_LEAN_AND_MEAN (#2807) 

Set definition WIN32_LEAN_AND_MEAN to avoid windows.h including a lot of libs that are usually not used.
This commit is contained in:
B3n30 2017-06-25 02:38:16 +02:00 committed by Yuri Kunde Schlesner
parent cf15b651ed
commit 6ba089fafb
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -79,6 +79,8 @@ else()
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 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.
add_definitions(/DWIN32_LEAN_AND_MEAN)
# set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms) # set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

3
src/citra/citra.cpp
View File

@ -18,7 +18,10 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
// windows.h needs to be included before shellapi.h
#include <windows.h> #include <windows.h>
#include <shellapi.h>
#endif #endif
#include "citra/config.h" #include "citra/config.h"