[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19798] trunk/blender/source/gameengine: Compile fixed for Win64.

Daniel Genrich daniel.genrich at gmx.net
Sun Apr 19 21:31:34 CEST 2009


Revision: 19798
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19798
Author:   genscher
Date:     2009-04-19 21:31:32 +0200 (Sun, 19 Apr 2009)

Log Message:
-----------
Compile fixed for Win64.
Please check if that also compiles on win32.

Modified Paths:
--------------
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    trunk/blender/source/gameengine/Ketsji/CMakeLists.txt

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2009-04-19 19:19:57 UTC (rev 19797)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2009-04-19 19:31:32 UTC (rev 19798)
@@ -208,7 +208,7 @@
 
 BOOL CALLBACK findGhostWindowHWNDProc(HWND hwnd, LPARAM lParam)
 {
-	GHOST_IWindow *p = (GHOST_IWindow*) GetWindowLong(hwnd, GWL_USERDATA);
+	GHOST_IWindow *p = (GHOST_IWindow*) GetWindowLongPtr(hwnd, GWLP_USERDATA);
 	BOOL ret = TRUE;
 	if (p == ghost_window_to_find)
 	{
@@ -292,8 +292,8 @@
 		if (ghost_hwnd != NULL)
 		{
 			GetCursorPos(&scr_save_mouse_pos);
-			ghost_wnd_proc = (WNDPROC) GetWindowLong(ghost_hwnd, GWL_WNDPROC);
-			SetWindowLong(ghost_hwnd,GWL_WNDPROC, (LONG) screenSaverWindowProc);
+			ghost_wnd_proc = (WNDPROC) GetWindowLongPtr(ghost_hwnd, GWLP_WNDPROC);
+			SetWindowLongPtr(ghost_hwnd,GWLP_WNDPROC, (uintptr_t) screenSaverWindowProc);
 		}
 	}
 	return ret;

Modified: trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Ketsji/CMakeLists.txt	2009-04-19 19:19:57 UTC (rev 19797)
+++ trunk/blender/source/gameengine/Ketsji/CMakeLists.txt	2009-04-19 19:31:32 UTC (rev 19798)
@@ -68,7 +68,7 @@
   ../../../source/gameengine/Physics/Sumo
   ../../../source/gameengine/Physics/Sumo/Fuzzics/include 
   ../../../source/gameengine/Network/LoopBackNetwork
-  ../../../intern/SoundSystem 
+  ../../../intern/SoundSystem
   ../../../source/blender/misc 
   ../../../source/blender/blenloader
   ../../../source/blender/gpu





More information about the Bf-blender-cvs mailing list