Attempt to fix mingw 64 bit compile error.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 24 May 2011 11:01:39 +0000 (11:01 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 24 May 2011 11:01:39 +0000 (11:01 +0000)
intern/bsp/CMakeLists.txt
intern/bsp/SConscript
intern/container/CTR_TaggedIndex.h
intern/decimation/CMakeLists.txt
intern/decimation/SConscript

index 2e615314543a8e55b6735b17e141ff7f5e7e7fb8..9f281586867a47181f665e2cb004017e1da0bffc 100644 (file)
@@ -27,6 +27,7 @@
 set(INC
        ./intern
        ../container
+       ../guardedalloc
        ../moto/include
        ../memutil
 )
index 43952f4ff1811707efaddb93fe7227da516313fb..4927c33dc8a652e059f8b98d323086d0cb215bc3 100644 (file)
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('intern/*.cpp')
 
-incs = 'intern ../container ../moto/include ../memutil'
+incs = 'intern ../container ../moto/include ../memutil ../guardedalloc'
 
 env.BlenderLib ('bf_intern_bsp', sources, Split(incs), [], libtype=['core','player'], priority=[200,100] )
 
index 0a57ce11d19d516ac0aaefaa9e2731fd8d5368d0..f48d492c28a3ecc83807cdad10419b8da48b9f8e 100644 (file)
@@ -52,6 +52,8 @@
 
 #include <functional>
 
+#include "MEM_sys_types.h"
+
 enum {
 
        empty_tag = 0x0,
@@ -100,9 +102,9 @@ public:
 
 #if defined(_WIN64)
        CTR_TaggedIndex(
-               const unsigned __int64 val
+               const unsigned int64_t val
        ) :
-               m_val ( ((unsigned __int64)val & index_mask)
+               m_val ( ((unsigned int64_t)val & index_mask)
                                | ( (empty_tag << tag_shift)
                                        & (~index_mask) ) ) {
        }
@@ -140,8 +142,8 @@ public:
        }
 
 #if defined(_WIN64)
-       operator unsigned __int64 () const {
-                       return (unsigned __int64)(m_val & index_mask);
+       operator unsigned int64_t () const {
+                       return (unsigned int64_t)(m_val & index_mask);
                }
 #endif
 
index b726a8cd6a163378a98b6578e82abfdec22251ef..6f9137b7189520b5ee2d5eb2da92d61117442675 100644 (file)
@@ -27,6 +27,7 @@
 set(INC
        .
        ../container
+       ../guardedalloc
        ../memutil
        ../moto/include
 )
index 6e2929cb650a1d48a444d0aa43c1c11eeb387341..6f4befb3ffa2b6a1183bc0c9f2dcd600073c909d 100644 (file)
@@ -3,6 +3,6 @@ Import ('env')
 
 sources = env.Glob('intern/*.cpp')
 
-incs = '. ../moto/include ../container ../memutil'
+incs = '. ../moto/include ../container ../memutil ../guardedalloc'
 
 env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core', 'player'], priority = [200, 100] )