From e1cd1278f6b7022fbbc6b910445954ac74368266 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Sun, 24 May 2020 12:03:33 -0400
Subject: [PATCH] Update macOS build instructions

---
 CMakeLists.txt   |  2 +-
 README.md        | 16 +++++++++-------
 Runtime/rstl.hpp |  4 ++--
 amuse            |  2 +-
 hecl             |  2 +-
 hecl-gui         |  2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index faf678652..f48fb80f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,7 +353,7 @@ add_subdirectory(visigen)
 add_dependencies(hecl visigen)
 
 if (NOT WINDOWS_STORE AND NOT NX)
-  find_package(Qt5Widgets)
+  find_package(Qt5Widgets PATHS /usr/local/opt/qt)
   if (Qt5Widgets_FOUND)
     message(STATUS "Qt5 found, hecl-gui will be built")
     add_subdirectory(hecl-gui)
diff --git a/README.md b/README.md
index 62b6934ab..4525d5e6b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Everything else is much too experimental to make portable/stable release builds
 
 ### Platform Support
 * Windows 7+ (64-bit support only)
-* macOS 10.11+
+* macOS 10.11+ (10.15+ / Xcode 11.5+ to build)
 * Linux
     * Arch is known to function with [`glx` vendor setup instructions](https://wiki.archlinux.org/index.php/Category:Graphics) *(main development/testing OS)*
     * **[WIP]** Vulkan loader detection is also integrated into the cmake for Linux
@@ -34,20 +34,22 @@ Everything else is much too experimental to make portable/stable release builds
 
 ### Build Prerequisites:
 * [CMake 3.13+](https://cmake.org)
-    * For Windows: Install `CMake Tools` in Visual Studio
+    * Windows: Install `CMake Tools` in Visual Studio
+    * macOS: `brew install cmake`
 * [Python 3+](https://python.org)
-    * For Windows: [Microsoft Store](https://go.microsoft.com/fwlink?linkID=2082640)
-    * Verify it's added to `%PATH%` by typing `python` in `cmd`.
+    * Windows: [Microsoft Store](https://go.microsoft.com/fwlink?linkID=2082640)
+        * Verify it's added to `%PATH%` by typing `python` in `cmd`.
+    * macOS: `brew install python@3`
 * LLVM development package *(headers and libs)*
     * [Specialized Windows Package](https://axiodl.com/files/LLVM-9.0.1-win64.exe)
-    * [Specialized macOS Package](https://axiodl.com/files/LLVM-9.0.1-Darwin.tar.xz)
+    * macOS: `brew install --force-bottle llvm`
 * **[Windows]** [Visual Studio 2019 Community](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
     * Select `C++ Development` and verify the following packages are included:
         * `Windows 10 SDK`
         * `CMake Tools`
         * `C++ Clang Compiler`
         * `C++ Clang-cl`
-* **[macOS]** [Xcode Tools](https://developer.apple.com/xcode/download/)
+* **[macOS]** [Xcode 1.15+](https://developer.apple.com/xcode/download/)
 * **[Linux]** recent development packages of `udev`, `x11`, `xcb`, `xinput`, `glx`, `asound`
 
 ### Prep Directions
@@ -101,7 +103,7 @@ The build will **not** work with the normal VS compiler!
 #### Xcode
 
 ```sh
-cmake -G Xcode -DCMAKE_BUILD_TYPE=Debug -DLLVM_ROOT_DIR=<path-to-llvm-dev-package> ../urde
+cmake -G Xcode -DCMAKE_BUILD_TYPE=Debug ../urde
 ```
 
 Then open `urde.xcodeproj`
diff --git a/Runtime/rstl.hpp b/Runtime/rstl.hpp
index c9b52be9b..f720a5955 100644
--- a/Runtime/rstl.hpp
+++ b/Runtime/rstl.hpp
@@ -35,8 +35,8 @@ public:
     using difference_type = std::ptrdiff_t;
     using pointer = T*;
     using reference = T&;
-// atdna workaround
-#if __cplusplus > 201703L
+// atdna / Apple Clang workaround
+#if __cplusplus > 201703L && !defined(__APPLE__)
     using iterator_category = std::contiguous_iterator_tag;
 #else
     using iterator_category = std::random_access_iterator_tag;
diff --git a/amuse b/amuse
index 6c7094f6f..70380d8fb 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit 6c7094f6fb7949536a85b85e4c87ecebd7b83fcf
+Subproject commit 70380d8fbcbc619ef815f64750817ca1052bb9f9
diff --git a/hecl b/hecl
index 583f5ddd6..6265d5c05 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 583f5ddd697fb956a1001511a9c3e86860654fd7
+Subproject commit 6265d5c05cd98c6eee456a5d19c682dd9f6b8a56
diff --git a/hecl-gui b/hecl-gui
index e5e3713b1..a23a15988 160000
--- a/hecl-gui
+++ b/hecl-gui
@@ -1 +1 @@
-Subproject commit e5e3713b12f6c6b93cae5ca59b1879f45d498f22
+Subproject commit a23a15988abd05a04dd7145c849d0ed9074c0c7f