summaryrefslogtreecommitdiff
path: root/src/os/windows
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2013-04-06 18:36:41 +0000
committermichi_cc <michi_cc@openttd.org>2013-04-06 18:36:41 +0000
commitd1212e0b1a66e3ea6a049ef8e985033adb661919 (patch)
tree1682193d136eb6a9a07fbc6af9844adf20d02d8a /src/os/windows
parentaa2c1ce4b078e5b54be7c1853ccd6a36c917b1e2 (diff)
downloadopenttd-d1212e0b1a66e3ea6a049ef8e985033adb661919.tar.xz
(svn r25153) -Fix [FS#5522] (r24487): [Win32] Don't statically link to SHGetFolderPath as it may not exist.
Diffstat (limited to 'src/os/windows')
-rw-r--r--src/os/windows/win32.cpp4
-rw-r--r--src/os/windows/win32.h6
2 files changed, 2 insertions, 8 deletions
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index 992ae16c7..bf4235346 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -505,14 +505,14 @@ void DetermineBasePaths(const char *exe)
char tmp[MAX_PATH];
TCHAR path[MAX_PATH];
#ifdef WITH_PERSONAL_DIR
- SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path);
+ OTTDSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path);
strecpy(tmp, WIDE_TO_MB_BUFFER(path, tmp, lengthof(tmp)), lastof(tmp));
AppendPathSeparator(tmp, MAX_PATH);
ttd_strlcat(tmp, PERSONAL_DIR, MAX_PATH);
AppendPathSeparator(tmp, MAX_PATH);
_searchpaths[SP_PERSONAL_DIR] = strdup(tmp);
- SHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path);
+ OTTDSHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path);
strecpy(tmp, WIDE_TO_MB_BUFFER(path, tmp, lengthof(tmp)), lastof(tmp));
AppendPathSeparator(tmp, MAX_PATH);
ttd_strlcat(tmp, PERSONAL_DIR, MAX_PATH);
diff --git a/src/os/windows/win32.h b/src/os/windows/win32.h
index 66c519973..941d3ea84 100644
--- a/src/os/windows/win32.h
+++ b/src/os/windows/win32.h
@@ -40,12 +40,6 @@ extern uint _codepage; // local code-page in the system @see win32_v.cpp:WM_INPU
# define WIDE_TO_MB_BUFFER(str, buffer, buflen) (str)
#endif
-/* Override SHGetFolderPath with our custom implementation */
-#if defined(SHGetFolderPath)
-#undef SHGetFolderPath
-#endif
-#define SHGetFolderPath OTTDSHGetFolderPath
-
HRESULT OTTDSHGetFolderPath(HWND, int, HANDLE, DWORD, LPTSTR);
#if defined(__MINGW32__)