Skip to content
Snippets Groups Projects
Commit 401ff8fa authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Start to get havok working

parent e4561458
No related branches found
No related tags found
No related merge requests found
......@@ -1472,6 +1472,38 @@
<key>version</key>
<string>1.0</string>
</map>
<key>llphysicsextensions_tpv</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2010, Linden Research, Inc.</string>
<key>license</key>
<string>commercial</string>
<key>license_file</key>
<string>LICENSES/llphysicsextensions.txt</string>
<key>name</key>
<string>llphysicsextensions_tpv</string>
<key>platforms</key>
<map>
<key>windows64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>9c39018c783443ee4b4eb368c937aeb3</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file://c:/bld/havok/llphysicsextensions_tpv-1.0.571939-windows64-571939.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>source_type</key>
<string>hg</string>
<key>version</key>
<string>1.0.571939</string>
</map>
<key>minizip-ng</key>
<map>
<key>canonical_repo</key>
......
......@@ -356,6 +356,10 @@ else()
add_definitions(-URELEASE_SHOW_ASSERT)
endif()
if(HAVOK_TPV)
add_definitions(-DHAVOK_BUILD=1)
endif(HAVOK_TPV)
option(ENABLE_TIMING "Enable all fast timers" ON)
if(ENABLE_TIMING)
add_definitions(-DAL_ENABLE_ALL_TIMERS=1)
......
......@@ -58,9 +58,15 @@ class LL_COMMON_API LLUUID
// CREATORS
//
LLUUID() = default;
#if HAVOK_BUILD
LLUUID(const LLUUID& rhs) { memcpy(mData, rhs.mData, UUID_BYTES); }
~LLUUID() {}
#endif
explicit LLUUID(const char *in_string); // Convert from string.
explicit LLUUID(const std::string_view in_string); // Convert from string.
//
// MANIPULATORS
//
......@@ -265,9 +271,11 @@ class LL_COMMON_API LLUUID
U8 mData[UUID_BYTES] = {};
};
#ifndef HAVOK_BUILD
static_assert(std::is_trivially_copyable<LLUUID>::value, "LLUUID must be trivial copy");
static_assert(std::is_trivially_move_assignable<LLUUID>::value, "LLUUID must be trivial move");
static_assert(std::is_standard_layout<LLUUID>::value, "LLUUID must be a standard layout type");
#endif
typedef std::vector<LLUUID> uuid_vec_t;
typedef std::set<LLUUID> uuid_set_t;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment