Merge c3668d02d4
into 0d0f64e32f
This commit is contained in:
commit
5a1ff9c50e
|
@ -254,9 +254,11 @@ jobs:
|
||||||
# remove LLVM from PATH so it doesn't overshadow the one provided by VS
|
# remove LLVM from PATH so it doesn't overshadow the one provided by VS
|
||||||
$env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'
|
$env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'
|
||||||
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build -DCMAKE_CXX_FLAGS="-Xclang -fexceptions -Xclang -fcxx-exceptions"
|
cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build
|
||||||
cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j $cpuCores
|
cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j $cpuCores
|
||||||
env:
|
env:
|
||||||
|
CXXFLAGS: --target=amd64-pc-windows-msvc -fdiagnostics-absolute-paths
|
||||||
|
CFLAGS: --target=amd64-pc-windows-msvc -fdiagnostics-absolute-paths
|
||||||
SDL2_VERSION: ${{ inputs.SDL2_VERSION }}
|
SDL2_VERSION: ${{ inputs.SDL2_VERSION }}
|
||||||
- name: Prepare Archive
|
- name: Prepare Archive
|
||||||
run: |
|
run: |
|
||||||
|
|
Loading…
Reference in New Issue