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

Updates for LLVM 10.0.1 on Windows

This commit is contained in:
Luke Street 2020-09-06 01:44:30 -04:00
parent dc586e8110
commit cfaf6fea47
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.appveyor.yml
View File

@ -35,26 +35,29 @@ install:
############################################################################ ############################################################################
# Install a recent CMake # Install a recent CMake
############################################################################ ############################################################################
- set CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-win64-x64.zip" - set CMAKE_VERSION=3.16.4
- set CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v%CMAKE_VERSION%/cmake-%CMAKE_VERSION%-win64-x64.zip"
- if not exist cmake.zip appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip - if not exist cmake.zip appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip
- if not exist cmake 7z x cmake.zip -oC:\projects\deps\cmake > nul - if not exist cmake 7z x cmake.zip -oC:\projects\deps\cmake > nul
############################################################################ ############################################################################
# Install custom LLVM # Install custom LLVM
############################################################################ ############################################################################
- set LLVM_URL="https://axiodl.com/files/LLVM-9.0.1-win64.exe" - set LLVM_VERSION=10.0.1
- if not exist llvm.exe appveyor DownloadFile %LLVM_URL% -FileName llvm.exe - set LLVM_URL="https://axiodl.com/files/LLVM-%LLVM_VERSION%-win64.exe"
- if not exist llvm llvm.exe /S /D=C:\projects\deps\llvm - set LLVM_ROOT_DIR=C:\projects\deps\llvm-%LLVM_VERSION%
- if not exist LLVM-%LLVM_VERSION%-win64.exe appveyor DownloadFile %LLVM_URL% -FileName LLVM-%LLVM_VERSION%-win64.exe
- if not exist llvm-%LLVM_VERSION% LLVM-%LLVM_VERSION%-win64.exe /S /D=%LLVM_ROOT_DIR%
before_build: before_build:
# Configure ninja # Configure ninja
- set PATH=C:\projects\deps\ninja;%PATH% - set PATH=C:\projects\deps\ninja;%PATH%
- ninja --version - ninja --version
# Configure cmake # Configure cmake
- set PATH=C:\projects\deps\cmake\cmake-3.16.4-win64-x64\bin;%PATH% - set PATH=C:\projects\deps\cmake\cmake-%CMAKE_VERSION%-win64-x64\bin;%PATH%
- cmake --version - cmake --version
# Configure LLVM # Configure LLVM
- set PATH=C:\projects\deps\llvm\bin;%PATH% - set PATH=%LLVM_ROOT_DIR%\bin;%PATH%
- llvm-config --version - llvm-config --version
- clang-cl -v - clang-cl -v
# Configure VS # Configure VS
@ -66,8 +69,7 @@ before_build:
build_script: build_script:
- mkdir build - mkdir build
- cd build - cd build
# -DCMAKE_LINKER=lld-link -DCMAKE_AR=llvm-ar -DCMAKE_RANLIB=llvm-ranlib - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DLLVM_ROOT_DIR=%LLVM_ROOT_DIR% -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_LINKER=lld-link -DCMAKE_AR=llvm-ar -DCMAKE_RANLIB=llvm-ranlib -GNinja ..
- cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DLLVM_ROOT_DIR=C:\projects\deps\llvm -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -GNinja ..
- ninja urde - ninja urde
#notifications: #notifications:

2
README.md
View File

@ -39,7 +39,7 @@ Everything else is much too experimental to make portable/stable release builds
* 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)* * LLVM development package *(headers and libs)*
* [Specialized Windows Package](https://axiodl.com/files/LLVM-9.0.1-win64-lld.exe) * [Specialized Windows Package](https://axiodl.com/files/LLVM-10.0.1-win64.exe)
* macOS: `brew install --force-bottle llvm` * 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:

2
hecl

@ -1 +1 @@
Subproject commit 06848e55532a4841ade0c373eb8d33550f4fcce8 Subproject commit 85949ed540d9f2df008f6d039cdfb0b76537c2cf