AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +00:00
Code Issues Projects Releases Wiki Activity

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
visigen/CMakeLists.txt
View File

@@ -32,6 +32,6 @@ if(APPLE)
set(PLAT_LIBS ${OPENGL_LIBRARY})
endif()
target_link_libraries(visigen logvisor athena-core athena-libyaml zeus glew
xxhash ${ZLIB_LIBRARIES} lzokay ${BOO_SYS_LIBS} ${PLAT_LIBS})
target_link_libraries(visigen logvisor athena-core zeus boo
xxhash ${ZLIB_LIBRARIES} lzokay hecl-light ${PLAT_LIBS})
endif()

4
visigen/VISIBuilder.hpp
View File

@@ -2,7 +2,7 @@
#include "VISIRenderer.hpp"
#include "zeus/CAABox.hpp"
#include "hecl/extern/boo/xxhash/xxhash.h"
#include "xxhash/xxhash.h"
#include "athena/MemoryWriter.hpp"
#include <unordered_map>
@@ -54,7 +54,7 @@ struct VISIBuilder {
Leaf& operator|=(const Leaf& other) {
if (bits.size() < other.bits.size())
bits.resize(other.bits.size());
for (int i = 0; i < other.bits.size(); ++i)
for (size_t i = 0; i < other.bits.size(); ++i)
bits[i] |= other.bits[i];
return *this;
}