[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34372] trunk/blender/intern/ghost/intern/ GHOST_SystemPathsWin32.cpp: fix compile on MinGW, missing define in the mingw headers.
Andrea Weikert
elubie at gmx.net
Mon Jan 17 20:39:26 CET 2011
Revision: 34372
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34372
Author: elubie
Date: 2011-01-17 19:39:25 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
fix compile on MinGW, missing define in the mingw headers.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemPathsWin32.cpp 2011-01-17 18:38:44 UTC (rev 34371)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemPathsWin32.cpp 2011-01-17 19:39:25 UTC (rev 34372)
@@ -35,7 +35,30 @@
#include <windows.h>
#include <shlobj.h>
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#if !defined(SHARD_PIDL)
+#define SHARD_PIDL 0x00000001L
+#endif
+
+#if !defined(SHARD_PATHA)
+#define SHARD_PATHA 0x00000002L
+#endif
+
+#if !defined(SHARD_PATHA)
+#define SHARD_PATHW 0x00000003L
+#endif
+
+#if !defined(SHARD_PATH)
+#ifdef UNICODE
+#define SHARD_PATH SHARD_PATHW
+#else
+#define SHARD_PATH SHARD_PATHA
+#endif
+#endif
+
+#endif
+
GHOST_SystemPathsWin32::GHOST_SystemPathsWin32()
{
}
@@ -82,7 +105,6 @@
void GHOST_SystemPathsWin32::addToSystemRecentFiles(const char* filename) const
{
- /* SHARD_PATHA is for ansi strings, use SHARD_PATHW for wide */
- SHAddToRecentDocs(SHARD_PATHA,filename);
-
+ /* SHARD_PATH resolves to SHARD_PATHA for non-UNICODE build */
+ SHAddToRecentDocs(SHARD_PATH,filename);
}
More information about the Bf-blender-cvs
mailing list