diff --git a/Engine/lib/opcode/Ice/IceFPU.h b/Engine/lib/opcode/Ice/IceFPU.h index a8dd69cc7..9cf2f2452 100644 --- a/Engine/lib/opcode/Ice/IceFPU.h +++ b/Engine/lib/opcode/Ice/IceFPU.h @@ -45,7 +45,7 @@ //! Fast square root for floating-point values. inline_ float FastSqrt(float square) { -#if defined( PLATFORM_WINDOWS ) +#if defined( PLATFORM_WINDOWS ) && !defined ( _WIN64 ) float retval; __asm { @@ -188,7 +188,7 @@ return x*x < epsilon; } -#ifdef PLATFORM_WINDOWS +#if defined( PLATFORM_WINDOWS ) && !defined ( _WIN64 ) #define FCOMI_ST0 _asm _emit 0xdb _asm _emit 0xf0 #define FCOMIP_ST0 _asm _emit 0xdf _asm _emit 0xf0 #define FCMOVB_ST0 _asm _emit 0xda _asm _emit 0xc0 diff --git a/Engine/lib/opcode/Ice/IceMemoryMacros.h b/Engine/lib/opcode/Ice/IceMemoryMacros.h index f0f27d5ed..f4d511189 100644 --- a/Engine/lib/opcode/Ice/IceMemoryMacros.h +++ b/Engine/lib/opcode/Ice/IceMemoryMacros.h @@ -47,7 +47,7 @@ //! \warning writes nb*4 bytes ! inline_ void StoreDwords(udword* dest, udword nb, udword value) { -#ifdef _WIN32 +#if defined( _WIN32 ) && !defined( _WIN64 ) // The asm code below **SHOULD** be equivalent to one of those C versions // or the other if your compiled is good: (checked on VC++ 6.0) //