diff --git a/extern/caelum/src/Astronomy.cpp b/extern/caelum/src/Astronomy.cpp index 27ea934ec..315b756fb 100644 --- a/extern/caelum/src/Astronomy.cpp +++ b/extern/caelum/src/Astronomy.cpp @@ -321,7 +321,7 @@ namespace Caelum 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 oldMode = ::_controlfp (0, 0); diff --git a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ClipboardManager.cpp b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ClipboardManager.cpp index 810ddb568..0de57f43d 100644 --- a/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ClipboardManager.cpp +++ b/extern/mygui_3.0.1/MyGUIEngine/src/MyGUI_ClipboardManager.cpp @@ -62,7 +62,11 @@ namespace MyGUI if (dwProcessID != ::GetCurrentProcessId()) return TRUE; +#ifdef _M_X64 + if (::GetWindowLongPtr(hWnd, GWLP_HINSTANCE) == lParam) +#else if (::GetWindowLong(hWnd, GWL_HINSTANCE) == lParam) +#endif { // Нашли. hWnd - то что надо g_hWnd = hWnd;