Merge branch 'dev' into kern18-changes

This commit is contained in:
Belal Ashraf 2024-04-07 19:04:09 +02:00
commit 339ecdf0aa
2 changed files with 9 additions and 5 deletions

View file

@ -1,6 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
# SPDX-FileCopyrightText: 2024 suyu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
set -e set -e
@ -9,12 +10,15 @@ set -e
ccache -sv ccache -sv
rm -rf build
mkdir -p build && cd build mkdir -p build && cd build
cmake .. \ /usr/bin/x86_64-w64-mingw32-cmake .. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWCross.cmake" \
-DDISPLAY_VERSION="$1" \ -DDISPLAY_VERSION="$1" \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \
-DSUYU_USE_PRECOMPILED_HEADERS=OFF \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \
-DUSE_DISCORD_PRESENCE=ON \
-DENABLE_QT_TRANSLATION=ON \ -DENABLE_QT_TRANSLATION=ON \
-DUSE_CCACHE=ON \ -DUSE_CCACHE=ON \
-DSUYU_USE_BUNDLED_SDL2=OFF \ -DSUYU_USE_BUNDLED_SDL2=OFF \

View file

@ -63,8 +63,8 @@ jobs:
image: linux-fresh image: linux-fresh
- type: linux - type: linux
image: linux-fresh image: linux-fresh
# - type: windows - type: windows
# image: linux-mingw image: linux-mingw
container: fijxu/build-environments:${{ matrix.image }} container: fijxu/build-environments:${{ matrix.image }}
# User 1001 doesn't exists on the images. # User 1001 doesn't exists on the images.
# options: -u 1001 # options: -u 1001