diff options
| author | Filippos Karapetis | 2018-12-16 19:50:05 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2018-12-16 19:50:05 +0200 |
| commit | 54159276c79fb07b562859ebaa46ea7c31ddcd4f (patch) | |
| tree | 5cfaca86de7e11c4f36de77570ea7cb9457b638e | |
| parent | 5e735d74a99f7f58561e2eead7dd63938cb6217f (diff) | |
| download | scummvm-rg350-54159276c79fb07b562859ebaa46ea7c31ddcd4f.tar.gz scummvm-rg350-54159276c79fb07b562859ebaa46ea7c31ddcd4f.tar.bz2 scummvm-rg350-54159276c79fb07b562859ebaa46ea7c31ddcd4f.zip | |
WIN32: Fix build after the addition of SHGetFolderPath()
| -rw-r--r-- | backends/platform/sdl/win32/win32_wrapper.cpp | 7 | ||||
| -rw-r--r-- | backends/saves/windows/windows-saves.cpp | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp index 6ad0f725ed..aa3a05fa48 100644 --- a/backends/platform/sdl/win32/win32_wrapper.cpp +++ b/backends/platform/sdl/win32/win32_wrapper.cpp @@ -20,16 +20,15 @@ * */ -#include "common/scummsys.h" -// We need certain functions that are excluded by default -#undef NONLS +#define WIN32_LEAN_AND_MEAN #include <windows.h> #if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) -// required for SHGetSpecialFolderPath in shlobj.h + // required for SHGetSpecialFolderPath in shlobj.h #define _WIN32_IE 0x400 #endif #include <shlobj.h> +#include "common/scummsys.h" #include "backends/platform/sdl/win32/win32_wrapper.h" // VerSetConditionMask, VerifyVersionInfo and SHGetFolderPath didn't appear until Windows 2000, diff --git a/backends/saves/windows/windows-saves.cpp b/backends/saves/windows/windows-saves.cpp index 967f0d8301..fec4828725 100644 --- a/backends/saves/windows/windows-saves.cpp +++ b/backends/saves/windows/windows-saves.cpp @@ -20,10 +20,6 @@ * */ -#include "common/scummsys.h" - -#include "backends/saves/windows/windows-saves.h" - #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER) #if defined(ARRAYSIZE) @@ -33,13 +29,14 @@ #include <windows.h> #undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) -// required for SHGFP_TYPE_CURRENT in shlobj.h + // required for SHGFP_TYPE_CURRENT in shlobj.h #define _WIN32_IE 0x500 #endif #include <shlobj.h> +#include "common/scummsys.h" #include "common/config-manager.h" -#include "common/savefile.h" +#include "backends/saves/windows/windows-saves.h" #include "backends/platform/sdl/win32/win32_wrapper.h" WindowsSaveFileManager::WindowsSaveFileManager() { |