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

Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Phillip Stephens 2020-05-24 17:39:22 -07:00
parent 26478dc220 e1cd1278f6
commit 8690f4ef3e
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -353,7 +353,7 @@ add_subdirectory(visigen)
add_dependencies(hecl visigen) add_dependencies(hecl visigen)
if (NOT WINDOWS_STORE AND NOT NX) if (NOT WINDOWS_STORE AND NOT NX)
find_package(Qt5Widgets) find_package(Qt5Widgets PATHS /usr/local/opt/qt)
if (Qt5Widgets_FOUND) if (Qt5Widgets_FOUND)
message(STATUS "Qt5 found, hecl-gui will be built") message(STATUS "Qt5 found, hecl-gui will be built")
add_subdirectory(hecl-gui) add_subdirectory(hecl-gui)

14
README.md
View File

@ -12,7 +12,7 @@ Everything else is much too experimental to make portable/stable release builds
### Platform Support ### Platform Support
* Windows 7+ (64-bit support only) * Windows 7+ (64-bit support only)
* macOS 10.11+ * macOS 10.11+ (10.15+ / Xcode 11.5+ to build)
* Linux * Linux
* Arch is known to function with [`glx` vendor setup instructions](https://wiki.archlinux.org/index.php/Category:Graphics) *(main development/testing OS)* * 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 * **[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: ### Build Prerequisites:
* [CMake 3.13+](https://cmake.org) * [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) * [Python 3+](https://python.org)
* For Windows: [Microsoft Store](https://go.microsoft.com/fwlink?linkID=2082640) * Windows: [Microsoft Store](https://go.microsoft.com/fwlink?linkID=2082640)
* Verify it's added to `%PATH%` by typing `python` in `cmd`. * Verify it's added to `%PATH%` by typing `python` in `cmd`.
* macOS: `brew install python@3`
* LLVM development package *(headers and libs)* * LLVM development package *(headers and libs)*
* [Specialized Windows Package](https://axiodl.com/files/LLVM-9.0.1-win64.exe) * [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) * **[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: * Select `C++ Development` and verify the following packages are included:
* `Windows 10 SDK` * `Windows 10 SDK`
* `CMake Tools` * `CMake Tools`
* `C++ Clang Compiler` * `C++ Clang Compiler`
* `C++ Clang-cl` * `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` * **[Linux]** recent development packages of `udev`, `x11`, `xcb`, `xinput`, `glx`, `asound`
### Prep Directions ### Prep Directions
@ -101,7 +103,7 @@ The build will **not** work with the normal VS compiler!
#### Xcode #### Xcode
```sh ```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` Then open `urde.xcodeproj`

4
Runtime/rstl.hpp
View File

@ -35,8 +35,8 @@ public:
using difference_type = std::ptrdiff_t; using difference_type = std::ptrdiff_t;
using pointer = T*; using pointer = T*;
using reference = T&; using reference = T&;
// atdna workaround // atdna / Apple Clang workaround
#if __cplusplus > 201703L #if __cplusplus > 201703L && !defined(__APPLE__)
using iterator_category = std::contiguous_iterator_tag; using iterator_category = std::contiguous_iterator_tag;
#else #else
using iterator_category = std::random_access_iterator_tag; using iterator_category = std::random_access_iterator_tag;

2
amuse

@ -1 +1 @@
Subproject commit 6c7094f6fb7949536a85b85e4c87ecebd7b83fcf Subproject commit 70380d8fbcbc619ef815f64750817ca1052bb9f9

2
hecl

@ -1 +1 @@
Subproject commit 583f5ddd697fb956a1001511a9c3e86860654fd7 Subproject commit 6265d5c05cd98c6eee456a5d19c682dd9f6b8a56

2
hecl-gui

@ -1 +1 @@
Subproject commit e5e3713b12f6c6b93cae5ca59b1879f45d498f22 Subproject commit a23a15988abd05a04dd7145c849d0ed9074c0c7f