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

Disable IPP for macOS universal build 

Remove LLVM dependency from README.md
Attempt to fix png include on Linux
This commit is contained in:
Luke Street 2021-04-18 21:39:09 -04:00
parent 7b072bc650
commit abe1eb71c0
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@ -104,6 +104,7 @@ jobs:
sudo installer -pkg /tmp/qt-$Qt_VERSION.mpkg -target / sudo installer -pkg /tmp/qt-$Qt_VERSION.mpkg -target /
- name: Install Intel IPP - name: Install Intel IPP
if: 'false' # not supported for universal build
run: | run: |
NAME="m_ipp_oneapi_p_${IPP_VERSION}_offline" NAME="m_ipp_oneapi_p_${IPP_VERSION}_offline"
curl -LSfs https://registrationcenter-download.intel.com/akdlm/irc_nas/17606/$NAME.dmg -o /tmp/$NAME.dmg curl -LSfs https://registrationcenter-download.intel.com/akdlm/irc_nas/17606/$NAME.dmg -o /tmp/$NAME.dmg

7
README.md
View File

@ -49,9 +49,6 @@ NFS files dumped from Metroid Prime Trilogy on Wii U VC can be used directly wit
* 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` * macOS: `brew install python@3`
* LLVM development package *(headers and libs)*
* [Specialized Windows Package](https://axiodl.com/files/LLVM-10.0.1-win64.exe)
* 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`
@ -62,8 +59,8 @@ NFS files dumped from Metroid Prime Trilogy on Wii U VC can be used directly wit
* **[Linux]** recent development packages of `udev`, `x11`, `xcb`, `xinput`, `glx`, `asound` * **[Linux]** recent development packages of `udev`, `x11`, `xcb`, `xinput`, `glx`, `asound`
* Ubuntu 20.04+ packages * Ubuntu 20.04+ packages
``` ```
build-essential curl git ninja-build llvm-dev libclang-dev clang lld zlib1g-dev libcurl4-openssl-dev build-essential curl git ninja-build clang lld zlib1g-dev libcurl4-openssl-dev \
libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev libpulse-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev libpulse-dev \
libudev-dev libpng-dev libncurses5-dev cmake libx11-xcb-dev python3 python-is-python3 qt5-default libudev-dev libpng-dev libncurses5-dev cmake libx11-xcb-dev python3 python-is-python3 qt5-default
``` ```

3
extern/libpng/CMakeLists.txt vendored
View File

@ -9,7 +9,8 @@ if (APPLE)
endif() endif()
elseif (NOT WIN32 AND NOT NX) # remove WIN32 when specter/freetype is gone elseif (NOT WIN32 AND NOT NX) # remove WIN32 when specter/freetype is gone
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
set(PNG_LIBRARIES PNG::PNG CACHE STRING "PNG libraries" FORCE) set(PNG_LIBRARIES ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "PNG libraries" FORCE)
set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE PATH "PNG include path" FORCE)
endif () endif ()
if (NOT PNG_LIBRARIES) if (NOT PNG_LIBRARIES)
message(STATUS "Using HECL's built-in libpng") message(STATUS "Using HECL's built-in libpng")