mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 15:44:56 +00:00
Update macOS build instructions
This commit is contained in:
@@ -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)
|
||||
|
||||
14
README.md
14
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)
|
||||
* 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`
|
||||
|
||||
@@ -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;
|
||||
|
||||
2
amuse
2
amuse
Submodule amuse updated: 6c7094f6fb...70380d8fbc
2
hecl
2
hecl
Submodule hecl updated: 583f5ddd69...6265d5c05c
2
hecl-gui
2
hecl-gui
Submodule hecl-gui updated: e5e3713b12...a23a15988a
Reference in New Issue
Block a user