Fix Windows64 rebuild, minor 64-bit fix

This commit is contained in:
Joshua Granick
2017-06-06 08:15:43 -07:00
parent af965d9b04
commit 02d4c3a63c
2 changed files with 14 additions and 2 deletions

View File

@@ -267,7 +267,19 @@ class WindowsPlatform extends PlatformTarget {
} }
CPPHelper.rebuild (project, [[ "-Dwindows" ]]); var commands = [];
if (targetFlags.exists ("64")) {
commands.push ([ "-Dwindow", "-DHXCPP_M64" ]);
} else {
commands.push ([ "-Dwindow", "-DHXCPP_M32" ]);
}
CPPHelper.rebuild (project, commands);
} }

View File

@@ -136,7 +136,7 @@ namespace lime {
HWND hwnd = wminfo.info.win.window; HWND hwnd = wminfo.info.win.window;
#ifdef _WIN64 #ifdef _WIN64
::SetClassLongPtr (hwnd, GCLP_HICON, reinterpret_cast<LONG>(icon)); ::SetClassLongPtr (hwnd, GCLP_HICON, reinterpret_cast<LONG_PTR>(icon));
#else #else
::SetClassLong (hwnd, GCL_HICON, reinterpret_cast<LONG>(icon)); ::SetClassLong (hwnd, GCL_HICON, reinterpret_cast<LONG>(icon));
#endif #endif