AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:07:43 +00:00
Code Issues Projects Releases Wiki Activity

Temporary xxhash fixes, update submodules

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/athena vendored

Submodule hecl/extern/athena updated: 781937da88...e63ea83f51

2
hecl/extern/boo vendored

Submodule hecl/extern/boo updated: 9b8ef4695f...4f4250baf7

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[];