[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58414] trunk/blender/source/gameengine: Fix some definitions for MinGW64

Antony Riakiotakis kalast at gmail.com
Fri Jul 19 21:19:16 CEST 2013


Revision: 58414
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58414
Author:   psy-fi
Date:     2013-07-19 19:19:15 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Fix some definitions for MinGW64

Modified Paths:
--------------
    trunk/blender/source/gameengine/Expressions/KX_HashedPtr.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp

Modified: trunk/blender/source/gameengine/Expressions/KX_HashedPtr.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/KX_HashedPtr.cpp	2013-07-19 16:44:17 UTC (rev 58413)
+++ trunk/blender/source/gameengine/Expressions/KX_HashedPtr.cpp	2013-07-19 19:19:15 UTC (rev 58414)
@@ -36,6 +36,8 @@
 {
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
 	unsigned __int64 key = (unsigned __int64)inDWord;
+#elif defined(FREE_WINDOWS64)
+	unsigned long long key = (unsigned long long)inDWord;
 #else
 	unsigned long key = (unsigned long)inDWord;
 #endif

Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2013-07-19 16:44:17 UTC (rev 58413)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2013-07-19 19:19:15 UTC (rev 58414)
@@ -38,6 +38,8 @@
 
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
 typedef unsigned __int64 uint_ptr;
+#elif defined(FREE_WINDOWS64)
+typedef unsigned long long uint_ptr;
 #else
 typedef unsigned long uint_ptr;
 #endif

Modified: trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp	2013-07-19 16:44:17 UTC (rev 58413)
+++ trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp	2013-07-19 19:19:15 UTC (rev 58414)
@@ -33,6 +33,8 @@
 
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
 typedef unsigned __int64 uint_ptr;
+#elif defined(FREE_WINDOWS64)
+typedef unsigned long long uint_ptr;
 #else
 typedef unsigned long uint_ptr;
 #endif




More information about the Bf-blender-cvs mailing list