mirror of
https://github.com/Lime3DS/Lime3DS
synced 2024-10-30 03:37:52 +00:00
Merged linux-fresh and linux-appimage build envs
This commit is contained in:
parent
106a4a2ef4
commit
ea0b627dc4
3 changed files with 5 additions and 3 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
if [ "$TARGET" = "appimage" ]; then
|
||||
# Compile the AppImage we distribute with Clang.
|
||||
export EXTRA_CMAKE_FLAGS=(-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_LINKER=/etc/bin/ld.lld)
|
||||
export EXTRA_CMAKE_FLAGS=(-DCMAKE_LINKER=/etc/bin/ld.lld)
|
||||
else
|
||||
# For the linux-fresh verification target, verify compilation without PCH as well.
|
||||
export EXTRA_CMAKE_FLAGS=(-DCITRA_USE_PRECOMPILED_HEADERS=OFF)
|
||||
|
@ -13,6 +13,8 @@ cmake .. -G Ninja \
|
|||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||
-DCMAKE_CXX_COMPILER=clang++-18 \
|
||||
-DCMAKE_C_COMPILER=clang-18 \
|
||||
"${EXTRA_CMAKE_FLAGS[@]}" \
|
||||
-DENABLE_QT_TRANSLATION=ON \
|
||||
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
|
||||
|
|
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -28,7 +28,7 @@ jobs:
|
|||
matrix:
|
||||
target: ["appimage", "fresh"]
|
||||
container:
|
||||
image: opensauce04/lime3ds-build:linux-${{ matrix.target }}
|
||||
image: opensauce04/lime3ds-build:latest
|
||||
options: -u 1001
|
||||
env:
|
||||
CCACHE_DIR: ${{ github.workspace }}/.ccache
|
||||
|
|
2
.github/workflows/format.yml
vendored
2
.github/workflows/format.yml
vendored
|
@ -10,7 +10,7 @@ jobs:
|
|||
clang-format:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: opensauce04/lime3ds-build:linux-fresh
|
||||
image: opensauce04/lime3ds-build:latest
|
||||
options: -u 1001
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
|
Loading…
Reference in a new issue