diff options
author | Thierry Crozat | 2017-04-24 01:20:47 +0100 |
---|---|---|
committer | Thierry Crozat | 2017-04-24 01:21:36 +0100 |
commit | 23987cc724df6a96cd823c03ddb26bd818794dd2 (patch) | |
tree | cfc9d0e6e6b1aca9606fc7a36bff5d8c9e304944 /backends/platform/sdl | |
parent | 25bb9106b6fd811e9159cd11f085c01d31a32caf (diff) | |
download | scummvm-rg350-23987cc724df6a96cd823c03ddb26bd818794dd2.tar.gz scummvm-rg350-23987cc724df6a96cd823c03ddb26bd818794dd2.tar.bz2 scummvm-rg350-23987cc724df6a96cd823c03ddb26bd818794dd2.zip |
WIN32: Comment out code that gets the user My Pictures directory
This broke compilation on buildbot as ShlObj.h cannot be found.
A developer that has access to Windows should take a look to
properly fix this.
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index 5724250109..a29151a47d 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -29,7 +29,7 @@ #include <windows.h> #undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #include <shellapi.h> -#include <ShlObj.h> +//#include <ShlObj.h> #include "common/scummsys.h" #include "common/config-manager.h" @@ -154,22 +154,22 @@ Common::String OSystem_Win32::getScreenshotsPath() { return screenshotsPath; } - char picturesPath[MAXPATHLEN]; - - // Use the My Pictures folder. - if (SHGetFolderPath(NULL, CSIDL_MYPICTURES, NULL, SHGFP_TYPE_CURRENT, picturesPath) != S_OK) { - warning("Unable to access My Pictures directory"); - return Common::String(); - } - - screenshotsPath = Common::String(picturesPath) + "\\ScummVM Screenshots\\"; - - // If the directory already exists (as it should in most cases), - // we don't want to fail, but we need to stop on other errors (such as ERROR_PATH_NOT_FOUND) - if (!CreateDirectory(screenshotsPath.c_str(), NULL)) { - if (GetLastError() != ERROR_ALREADY_EXISTS) - error("Cannot create ScummVM Screenshots folder"); - } +// char picturesPath[MAXPATHLEN]; +// +// // Use the My Pictures folder. +// if (SHGetFolderPath(NULL, CSIDL_MYPICTURES, NULL, SHGFP_TYPE_CURRENT, picturesPath) != S_OK) { +// warning("Unable to access My Pictures directory"); +// return Common::String(); +// } +// +// screenshotsPath = Common::String(picturesPath) + "\\ScummVM Screenshots\\"; +// +// // If the directory already exists (as it should in most cases), +// // we don't want to fail, but we need to stop on other errors (such as ERROR_PATH_NOT_FOUND) +// if (!CreateDirectory(screenshotsPath.c_str(), NULL)) { +// if (GetLastError() != ERROR_ALREADY_EXISTS) +// error("Cannot create ScummVM Screenshots folder"); +// } return screenshotsPath; } |