Browse Source

Fix lib Opcode to compile on WIN64.

LuisAntonRebollo 11 years ago
parent
commit
1bbc3d9e8a
2 changed files with 3 additions and 3 deletions
  1. 2 2
      Engine/lib/opcode/Ice/IceFPU.h
  2. 1 1
      Engine/lib/opcode/Ice/IceMemoryMacros.h

+ 2 - 2
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

+ 1 - 1
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)
 		//