diff options
| -rw-r--r-- | intern/bsp/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/bsp/SConscript | 2 | ||||
| -rw-r--r-- | intern/container/CTR_TaggedIndex.h | 10 | ||||
| -rw-r--r-- | intern/decimation/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/decimation/SConscript | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index 2e615314543..9f281586867 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -27,6 +27,7 @@ set(INC ./intern ../container + ../guardedalloc ../moto/include ../memutil ) diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index 43952f4ff18..4927c33dc8a 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -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] ) diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h index 0a57ce11d19..f48d492c28a 100644 --- a/intern/container/CTR_TaggedIndex.h +++ b/intern/container/CTR_TaggedIndex.h @@ -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 diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt index b726a8cd6a1..6f9137b7189 100644 --- a/intern/decimation/CMakeLists.txt +++ b/intern/decimation/CMakeLists.txt @@ -27,6 +27,7 @@ set(INC . ../container + ../guardedalloc ../memutil ../moto/include ) diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 6e2929cb650..6f4befb3ffa 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -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] ) |