From 6ba089fafbf6589fc34b1924e4d8a3c0103eeae7 Mon Sep 17 00:00:00 2001 From: B3n30 Date: Sun, 25 Jun 2017 02:38:16 +0200 Subject: [PATCH] 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. --- CMakeLists.txt | 2 ++ src/citra/citra.cpp | 3 +++ 2 files changed, 5 insertions(+) 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 + +#include #endif #include "citra/config.h"