From 822227a1ca4bd06b125d42a4328578a108a89412 Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Fri, 6 Sep 2019 23:30:53 -0700
Subject: [PATCH] Temporary xxhash fixes, update submodules

---
 hecl/extern/athena                 | 2 +-
 hecl/extern/boo                    | 2 +-
 hecl/include/hecl/Backend.hpp      | 3 ++-
 hecl/include/hecl/PipelineBase.hpp | 2 +-
 hecl/lib/Blender/Connection.cpp    | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hecl/extern/athena b/hecl/extern/athena
index 781937da8..e63ea83f5 160000
--- a/hecl/extern/athena
+++ b/hecl/extern/athena
@@ -1 +1 @@
-Subproject commit 781937da88d2117d2a7e8c19c0e6bd5902c69db2
+Subproject commit e63ea83f51c50329a5fff4d05625a45b58890756
diff --git a/hecl/extern/boo b/hecl/extern/boo
index 9b8ef4695..4f4250baf 160000
--- a/hecl/extern/boo
+++ b/hecl/extern/boo
@@ -1 +1 @@
-Subproject commit 9b8ef4695f3f1d07b29580241fc266abc17dc29c
+Subproject commit 4f4250baf7cbcafc4fd78de8ebb2a456d219bfe0
diff --git a/hecl/include/hecl/Backend.hpp b/hecl/include/hecl/Backend.hpp
index 264051942..e8f3eb7ec 100644
--- a/hecl/include/hecl/Backend.hpp
+++ b/hecl/include/hecl/Backend.hpp
@@ -7,7 +7,8 @@
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
-#include <xxhash/xxhash.h>
+#include "hecl.hpp"
+#include "../extern/boo/xxhash/xxhash.h"
 
 namespace hecl::Backend {
 struct ExtensionSlot;
diff --git a/hecl/include/hecl/PipelineBase.hpp b/hecl/include/hecl/PipelineBase.hpp
index b1a62d4e7..85c0a318e 100644
--- a/hecl/include/hecl/PipelineBase.hpp
+++ b/hecl/include/hecl/PipelineBase.hpp
@@ -9,7 +9,7 @@
 #include "hecl/Compilers.hpp"
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
-#include <xxhash/xxhash.h>
+#include "../extern/boo/xxhash/xxhash.h"
 
 #define HECL_RUNTIME 1
 
diff --git a/hecl/lib/Blender/Connection.cpp b/hecl/lib/Blender/Connection.cpp
index 905efb67b..56f175f4e 100644
--- a/hecl/lib/Blender/Connection.cpp
+++ b/hecl/lib/Blender/Connection.cpp
@@ -52,7 +52,7 @@ Token SharedBlenderToken;
 #ifdef __APPLE__
 #define DEFAULT_BLENDER_BIN "/Applications/Blender.app/Contents/MacOS/blender"
 #else
-#define DEFAULT_BLENDER_BIN "blender-2.8"
+#define DEFAULT_BLENDER_BIN "blender"
 #endif
 
 extern "C" uint8_t HECL_BLENDERSHELL[];