This is squashed commit from the follwing commits:

* various changes to make it compile with clang

* don't compile recompiler on linux yet but make the CMake build include asmjit already

* add experimental travis bot

* modify yml to match

* try to build and install wxWidgets, since it's not in the travis repo

* use newer cmake version for travis

* add keys with sudo

* use sudo for all apt- commands

* Add additional dependencies

* use version approriate gcc flags for c++11

* try clang, gcc too old

* set c++0x flag for clang

* use gcc 4.8

* use gcc 4.8 and add the repo for it

* use gcc 4.8 even for clang to get newer headers

* fix ambiguous conversions

* add lz from hykem and more explicit conversions from be for x86

* more switch disambiguation

* more switch disambiguation

* add additional unigned int casts to deal with be_t conversion ambiguity

* remove unnecessary clang flag

* add lz.cpp to vcxproj and cast to u32 instead of unsigned int

* correct temporaray #ifdefs
This commit is contained in:
Bigpet 2014-04-25 18:57:00 +02:00 committed by Peter Tissen
parent a2157a5365
commit eea3aa9729
23 changed files with 459 additions and 680 deletions

View file

@ -57,6 +57,13 @@ struct ID
m_data = other.m_data;
other.m_data = nullptr;
}
ID& operator=(ID&& other)
{
std::swap(m_name,other.m_name);
std::swap(m_attr,other.m_attr);
std::swap(m_data,other.m_data);
return *this;
}
void Kill()
{
@ -113,7 +120,7 @@ public:
{
std::lock_guard<std::mutex> lock(m_mtx_main);
m_id_map[m_cur_id] = std::move(ID(name, data, attr));
m_id_map[m_cur_id] = ID(name, data, attr);
return m_cur_id++;
}