AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temporary xxhash fixes, update submodules

This commit is contained in:
Phillip Stephens 2019-09-06 23:30:53 -07:00
parent 6c8ffcddad
commit 822227a1ca
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit 781937da88d2117d2a7e8c19c0e6bd5902c69db2 Subproject commit e63ea83f51c50329a5fff4d05625a45b58890756

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit 9b8ef4695f3f1d07b29580241fc266abc17dc29c Subproject commit 4f4250baf7cbcafc4fd78de8ebb2a456d219bfe0

3
hecl/include/hecl/Backend.hpp
View File

@ -7,7 +7,8 @@
#include <boo/graphicsdev/IGraphicsDataFactory.hpp> #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
#include <xxhash/xxhash.h> #include "hecl.hpp"
#include "../extern/boo/xxhash/xxhash.h"
namespace hecl::Backend { namespace hecl::Backend {
struct ExtensionSlot; struct ExtensionSlot;

2
hecl/include/hecl/PipelineBase.hpp
View File

@ -9,7 +9,7 @@
#include "hecl/Compilers.hpp" #include "hecl/Compilers.hpp"
#include <boo/graphicsdev/IGraphicsDataFactory.hpp> #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
#include <xxhash/xxhash.h> #include "../extern/boo/xxhash/xxhash.h"
#define HECL_RUNTIME 1 #define HECL_RUNTIME 1

2
hecl/lib/Blender/Connection.cpp
View File

@ -52,7 +52,7 @@ Token SharedBlenderToken;
#ifdef __APPLE__ #ifdef __APPLE__
#define DEFAULT_BLENDER_BIN "/Applications/Blender.app/Contents/MacOS/blender" #define DEFAULT_BLENDER_BIN "/Applications/Blender.app/Contents/MacOS/blender"
#else #else
#define DEFAULT_BLENDER_BIN "blender-2.8" #define DEFAULT_BLENDER_BIN "blender"
#endif #endif
extern "C" uint8_t HECL_BLENDERSHELL[]; extern "C" uint8_t HECL_BLENDERSHELL[];