[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30060] trunk/blender/intern/ghost/intern/ GHOST_SystemWin32.cpp: fix mingw compile

Andrea Weikert elubie at gmx.net
Tue Jul 6 22:31:56 CEST 2010


Revision: 30060
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30060
Author:   elubie
Date:     2010-07-06 22:31:55 +0200 (Tue, 06 Jul 2010)

Log Message:
-----------
fix mingw compile
- seems to have been conflicting #defines for INT, solved by moving #include up

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-07-06 20:07:07 UTC (rev 30059)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-07-06 20:31:55 UTC (rev 30060)
@@ -37,6 +37,14 @@
 #include "GHOST_SystemWin32.h"
 #include "GHOST_EventDragnDrop.h"
 
+#define WIN32_LEAN_AND_MEAN
+#ifdef _WIN32_IE
+#undef _WIN32_IE
+#endif
+#define _WIN32_IE 0x0501
+#include <windows.h>
+#include <shlobj.h>
+
 // win64 doesn't define GWL_USERDATA
 #ifdef WIN32
 #ifndef GWL_USERDATA
@@ -88,8 +96,6 @@
 #include "GHOST_WindowWin32.h"
 #include "GHOST_NDOFManager.h"
 
-#include <shlobj.h>
-
 // Key code values not found in winuser.h
 #ifndef VK_MINUS
 #define VK_MINUS 0xBD
@@ -1129,4 +1135,4 @@
 	}
 
 	return NULL;
-}
\ No newline at end of file
+}





More information about the Bf-blender-cvs mailing list