diff options
| author | B3n30 <bene_thomas@web.de> | 2017-06-25 02:38:16 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-25 02:38:16 +0200 |
| commit | 6ba089fafbf6589fc34b1924e4d8a3c0103eeae7 (patch) | |
| tree | d53ceecbe1f1b21bb909e63430b1861d7eb469d5 | |
| parent | Merge pull request #2801 from yuriks/session-svcs (diff) | |
| download | yuzu-6ba089fafbf6589fc34b1924e4d8a3c0103eeae7.tar yuzu-6ba089fafbf6589fc34b1924e4d8a3c0103eeae7.tar.gz yuzu-6ba089fafbf6589fc34b1924e4d8a3c0103eeae7.tar.bz2 yuzu-6ba089fafbf6589fc34b1924e4d8a3c0103eeae7.tar.lz yuzu-6ba089fafbf6589fc34b1924e4d8a3c0103eeae7.tar.xz yuzu-6ba089fafbf6589fc34b1924e4d8a3c0103eeae7.tar.zst yuzu-6ba089fafbf6589fc34b1924e4d8a3c0103eeae7.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/citra/citra.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a61dee6e0..4668d4bea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,6 +79,8 @@ else() add_definitions(/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_WARNINGS) # Avoid windows.h junk 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(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index dd357ff72..14574e56c 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -18,7 +18,10 @@ #endif #ifdef _WIN32 +// windows.h needs to be included before shellapi.h #include <windows.h> + +#include <shellapi.h> #endif #include "citra/config.h" |