diff options
Diffstat (limited to 'source/gameengine')
5 files changed, 4 insertions, 14 deletions
diff --git a/source/gameengine/Expressions/intern/HashedPtr.cpp b/source/gameengine/Expressions/intern/HashedPtr.cpp index 005ac16b231..11d9482f993 100644 --- a/source/gameengine/Expressions/intern/HashedPtr.cpp +++ b/source/gameengine/Expressions/intern/HashedPtr.cpp @@ -40,10 +40,8 @@ CHashedPtr::CHashedPtr(void* val) : m_valptr(val) unsigned int CHashedPtr::hash() const { -#if defined(_WIN64) && !defined(FREE_WINDOWS64) +#if defined(_WIN64) unsigned __int64 key = (unsigned __int64)m_valptr; -#elif defined(FREE_WINDOWS64) - unsigned long long key = (unsigned long long)m_valptr; #else unsigned long key = (unsigned long)m_valptr; #endif diff --git a/source/gameengine/Expressions/intern/InputParser.cpp b/source/gameengine/Expressions/intern/InputParser.cpp index e8cc7fba284..583d8da63cb 100644 --- a/source/gameengine/Expressions/intern/InputParser.cpp +++ b/source/gameengine/Expressions/intern/InputParser.cpp @@ -37,7 +37,7 @@ // cool things like (IF(LOD==1,CCurvedValue,IF(LOD==2,CCurvedValue2)) etc... #include "EXP_IfExpr.h" -#if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS) +#if defined(WIN32) || defined(WIN64) #define strcasecmp _stricmp #ifndef strtoll diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp index f3947fdd710..be1a4b4ef3a 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp +++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp @@ -31,10 +31,8 @@ */ -#if defined(_WIN64) && !defined(FREE_WINDOWS64) +#if defined(_WIN64) typedef unsigned __int64 uint_ptr; -#elif defined(FREE_WINDOWS64) -typedef unsigned long long uint_ptr; #else typedef unsigned long uint_ptr; #endif diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index b0a8e376eb6..d82a0fd533b 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -80,12 +80,6 @@ #define DEFAULT_LOGIC_TIC_RATE 60.0 //#define DEFAULT_PHYSICS_TIC_RATE 60.0 -#ifdef FREE_WINDOWS /* XXX mingw64 (gcc 4.7.0) defines a macro for DrawText that translates to DrawTextA. Not good */ -#ifdef DrawText -#undef DrawText -#endif -#endif - const char KX_KetsjiEngine::m_profileLabels[tc_numCategories][15] = { "Physics:", // tc_physics "Logic:", // tc_logic diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp index 0db1fa293da..b91a312a5d7 100644 --- a/source/gameengine/VideoTexture/ImageBase.cpp +++ b/source/gameengine/VideoTexture/ImageBase.cpp @@ -43,7 +43,7 @@ extern "C" { #include "Exception.h" -#if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS) +#if (defined(WIN32) || defined(WIN64)) #define strcasecmp _stricmp #endif |