diff options
Diffstat (limited to 'source/kernel')
| -rw-r--r-- | source/kernel/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/kernel/SConscript | 2 | ||||
| -rw-r--r-- | source/kernel/gen_system/GEN_HashedPtr.cpp | 9 | ||||
| -rw-r--r-- | source/kernel/gen_system/SYS_SingletonSystem.cpp | 2 | ||||
| -rw-r--r-- | source/kernel/gen_system/SYS_SingletonSystem.h | 1 |
5 files changed, 14 insertions, 10 deletions
diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt index ac759393326..3aea2b9bcb0 100644 --- a/source/kernel/CMakeLists.txt +++ b/source/kernel/CMakeLists.txt @@ -27,11 +27,11 @@ SET(INC gen_messaging gen_system ../../intern/string ../../intern/moto/include ../../source/blender/blenloader ) FILE(GLOB SRC - gen_messaging/intern/messaging.c - gen_system/GEN_HashedPtr.cpp - gen_system/GEN_Matrix4x4.cpp - gen_system/SYS_SingletonSystem.cpp - gen_system/SYS_System.cpp + gen_messaging/intern/messaging.c + gen_system/GEN_HashedPtr.cpp + gen_system/GEN_Matrix4x4.cpp + gen_system/SYS_SingletonSystem.cpp + gen_system/SYS_System.cpp ) BLENDERLIB(bf_kernel "${SRC}" "${INC}") diff --git a/source/kernel/SConscript b/source/kernel/SConscript index 8bd1a18f835..3110f46cfad 100644 --- a/source/kernel/SConscript +++ b/source/kernel/SConscript @@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp' incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader ' -env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 150] ) +env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core','player'], priority = [400,100] ) diff --git a/source/kernel/gen_system/GEN_HashedPtr.cpp b/source/kernel/gen_system/GEN_HashedPtr.cpp index 6dbed1fb7a8..ff9de465a34 100644 --- a/source/kernel/gen_system/GEN_HashedPtr.cpp +++ b/source/kernel/gen_system/GEN_HashedPtr.cpp @@ -40,11 +40,12 @@ // is a 32-bit integer, use all the bits of the pointer as long // as possible. // - +#if 1 unsigned int GEN_Hash(void * inDWord) { uintptr_t key = (uintptr_t)inDWord; - +#if 0 + // this is way too complicated key += ~(key << 16); key ^= (key >> 5); key += (key << 3); @@ -53,4 +54,8 @@ unsigned int GEN_Hash(void * inDWord) key ^= (key >> 17); return (unsigned int)(key & 0xffffffff); +#else + return (unsigned int)(key ^ (key>>4)); +#endif } +#endif
\ No newline at end of file diff --git a/source/kernel/gen_system/SYS_SingletonSystem.cpp b/source/kernel/gen_system/SYS_SingletonSystem.cpp index 47e35cf84d8..43d70a94ae1 100644 --- a/source/kernel/gen_system/SYS_SingletonSystem.cpp +++ b/source/kernel/gen_system/SYS_SingletonSystem.cpp @@ -95,6 +95,6 @@ void SYS_SingletonSystem::SYS_WriteCommandLineString(const char *paramname, cons m_string_commandlineparms.insert(paramname, value); } -SYS_SingletonSystem::SYS_SingletonSystem() : m_soundfilecache(NULL) +SYS_SingletonSystem::SYS_SingletonSystem() { } diff --git a/source/kernel/gen_system/SYS_SingletonSystem.h b/source/kernel/gen_system/SYS_SingletonSystem.h index 175656ac4ed..b72070c4e23 100644 --- a/source/kernel/gen_system/SYS_SingletonSystem.h +++ b/source/kernel/gen_system/SYS_SingletonSystem.h @@ -56,7 +56,6 @@ private: GEN_Map<STR_HashedString,int> m_int_commandlineparms; GEN_Map<STR_HashedString,float> m_float_commandlineparms; GEN_Map<STR_HashedString,STR_String> m_string_commandlineparms; - void* m_soundfilecache; }; #endif //__SINGLETONSYSTEM_H |