[Scummvm-git-logs] scummvm master -> 54159276c79fb07b562859ebaa46ea7c31ddcd4f

bluegr bluegr at gmail.com
Sun Dec 16 18:50:21 CET 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
54159276c7 WIN32: Fix build after the addition of SHGetFolderPath()


Commit: 54159276c79fb07b562859ebaa46ea7c31ddcd4f
    https://github.com/scummvm/scummvm/commit/54159276c79fb07b562859ebaa46ea7c31ddcd4f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2018-12-16T19:50:05+02:00

Commit Message:
WIN32: Fix build after the addition of SHGetFolderPath()

Changed paths:
    backends/platform/sdl/win32/win32_wrapper.cpp
    backends/saves/windows/windows-saves.cpp


diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp
index 6ad0f72..aa3a05f 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 967f0d8..fec4828 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() {





More information about the Scummvm-git-logs mailing list