Compile fixed for Win64.
authorDaniel Genrich <daniel.genrich@gmx.net>
Sun, 19 Apr 2009 19:31:32 +0000 (19:31 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Sun, 19 Apr 2009 19:31:32 +0000 (19:31 +0000)
Please check if that also compiles on win32.

source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/Ketsji/CMakeLists.txt

index 6ff46ca82008f2b75a8b7bd407dc92cd3fd9acc5..0ecbbea3af6266e09c5b528ceac63375969e3504 100644 (file)
@@ -208,7 +208,7 @@ static LRESULT CALLBACK screenSaverWindowProc(HWND hwnd, UINT uMsg, WPARAM wPara
 
 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 @@ bool GPG_Application::startScreenSaverFullScreen(
                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;
index d45d5345678f6c23ff7ddfde401df2b0f48a4278..b848fa9ef42e0a58f9b9b76cc4f673cf5aa1d218 100644 (file)
@@ -68,7 +68,7 @@ SET(INC
   ../../../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