Two quick fixes for building a windows x64 release

actorid
Ace 14 years ago
parent 3351d1571e
commit 3b47eb4a69

@ -321,7 +321,7 @@ namespace Caelum
getGregorianDateTimeFromJulianDay(julianDay, year, month, day, hour, minute, second); getGregorianDateTimeFromJulianDay(julianDay, year, month, day, hour, minute, second);
} }
#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && (OGRE_COMPILER == OGRE_COMPILER_MSVC) #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && (OGRE_COMPILER == OGRE_COMPILER_MSVC) && (OGRE_ARCH_TYPE != OGRE_ARCHITECTURE_64)
int Astronomy::enterHighPrecissionFloatingPointMode () int Astronomy::enterHighPrecissionFloatingPointMode ()
{ {
int oldMode = ::_controlfp (0, 0); int oldMode = ::_controlfp (0, 0);

@ -62,7 +62,11 @@ namespace MyGUI
if (dwProcessID != ::GetCurrentProcessId()) if (dwProcessID != ::GetCurrentProcessId())
return TRUE; return TRUE;
#ifdef _M_X64
if (::GetWindowLongPtr(hWnd, GWLP_HINSTANCE) == lParam)
#else
if (::GetWindowLong(hWnd, GWL_HINSTANCE) == lParam) if (::GetWindowLong(hWnd, GWL_HINSTANCE) == lParam)
#endif
{ {
// Нашли. hWnd - то что надо // Нашли. hWnd - то что надо
g_hWnd = hWnd; g_hWnd = hWnd;

Loading…
Cancel
Save