forked from ShuriZma/suyu
Full rebrand
This commit is contained in:
parent
c445fa1e3e
commit
88b901a24e
|
@ -9,7 +9,7 @@ ccache -s
|
||||||
BUILD_FLAVOR="mainline"
|
BUILD_FLAVOR="mainline"
|
||||||
|
|
||||||
BUILD_TYPE="release"
|
BUILD_TYPE="release"
|
||||||
if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
|
if [ "${GITHUB_REPOSITORY}" == "suyu-emu/suyu" ]; then
|
||||||
BUILD_TYPE="relWithDebInfo"
|
BUILD_TYPE="relWithDebInfo"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
. ./.ci/scripts/common/pre-upload.sh
|
. ./.ci/scripts/common/pre-upload.sh
|
||||||
|
|
||||||
REV_NAME="yuzu-${GITDATE}-${GITREV}"
|
REV_NAME="suyu-${GITDATE}-${GITREV}"
|
||||||
|
|
||||||
BUILD_FLAVOR="mainline"
|
BUILD_FLAVOR="mainline"
|
||||||
|
|
||||||
BUILD_TYPE_LOWER="release"
|
BUILD_TYPE_LOWER="release"
|
||||||
BUILD_TYPE_UPPER="Release"
|
BUILD_TYPE_UPPER="Release"
|
||||||
if [ "${GITHUB_REPOSITORY}" == "yuzu-emu/yuzu" ]; then
|
if [ "${GITHUB_REPOSITORY}" == "suyu-emu/suyu" ]; then
|
||||||
BUILD_TYPE_LOWER="relWithDebInfo"
|
BUILD_TYPE_LOWER="relWithDebInfo"
|
||||||
BUILD_TYPE_UPPER="RelWithDebInfo"
|
BUILD_TYPE_UPPER="RelWithDebInfo"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -19,9 +19,9 @@ cmake .. \
|
||||||
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
|
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
|
||||||
-DENABLE_QT_TRANSLATION=ON \
|
-DENABLE_QT_TRANSLATION=ON \
|
||||||
-DUSE_DISCORD_PRESENCE=ON \
|
-DUSE_DISCORD_PRESENCE=ON \
|
||||||
-DYUZU_CRASH_DUMPS=ON \
|
-DSUYU_CRASH_DUMPS=ON \
|
||||||
-DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
|
-DSUYU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
|
||||||
-DYUZU_USE_BUNDLED_FFMPEG=ON \
|
-DSUYU_USE_BUNDLED_FFMPEG=ON \
|
||||||
-GNinja
|
-GNinja
|
||||||
|
|
||||||
ninja
|
ninja
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
mkdir -p "ccache" || true
|
mkdir -p "ccache" || true
|
||||||
chmod a+x ./.ci/scripts/clang/docker.sh
|
chmod a+x ./.ci/scripts/clang/docker.sh
|
||||||
# the UID for the container yuzu user is 1027
|
# the UID for the container suyu user is 1027
|
||||||
sudo chown -R 1027 ./
|
sudo chown -R 1027 ./
|
||||||
docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/clang/docker.sh "$1"
|
docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/suyu/ccache -v "$(pwd):/suyu" -w /suyu suyuemu/build-environments:linux-fresh /bin/bash /suyu/.ci/scripts/clang/docker.sh "$1"
|
||||||
sudo chown -R $UID ./
|
sudo chown -R $UID ./
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
. .ci/scripts/common/pre-upload.sh
|
. .ci/scripts/common/pre-upload.sh
|
||||||
|
|
||||||
REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
|
REV_NAME="suyu-linux-${GITDATE}-${GITREV}"
|
||||||
ARCHIVE_NAME="${REV_NAME}.tar.xz"
|
ARCHIVE_NAME="${REV_NAME}.tar.xz"
|
||||||
COMPRESSION_FLAGS="-cJvf"
|
COMPRESSION_FLAGS="-cJvf"
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ fi
|
||||||
|
|
||||||
mkdir "$DIR_NAME"
|
mkdir "$DIR_NAME"
|
||||||
|
|
||||||
cp build/bin/yuzu-cmd "$DIR_NAME"
|
cp build/bin/suyu-cmd "$DIR_NAME"
|
||||||
cp build/bin/yuzu "$DIR_NAME"
|
cp build/bin/suyu "$DIR_NAME"
|
||||||
|
|
||||||
. .ci/scripts/common/post-upload.sh
|
. .ci/scripts/common/post-upload.sh
|
||||||
|
|
|
@ -4,6 +4,6 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
# Run clang-format
|
# Run clang-format
|
||||||
cd /yuzu
|
cd /suyu
|
||||||
chmod a+x ./.ci/scripts/format/script.sh
|
chmod a+x ./.ci/scripts/format/script.sh
|
||||||
./.ci/scripts/format/script.sh
|
./.ci/scripts/format/script.sh
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
chmod a+x ./.ci/scripts/format/docker.sh
|
chmod a+x ./.ci/scripts/format/docker.sh
|
||||||
# the UID for the container yuzu user is 1027
|
# the UID for the container suyu user is 1027
|
||||||
sudo chown -R 1027 ./
|
sudo chown -R 1027 ./
|
||||||
docker run -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh
|
docker run -v "$(pwd):/suyu" -w /suyu suyuemu/build-environments:linux-clang-format /bin/bash -ex /suyu/.ci/scripts/format/docker.sh
|
||||||
sudo chown -R $UID ./
|
sudo chown -R $UID ./
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
# Exit on error, rather than continuing with the rest of the script.
|
# Exit on error, rather than continuing with the rest of the script.
|
||||||
|
@ -20,10 +20,10 @@ cmake .. \
|
||||||
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \
|
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \
|
||||||
-DENABLE_QT_TRANSLATION=OFF \
|
-DENABLE_QT_TRANSLATION=OFF \
|
||||||
-DUSE_DISCORD_PRESENCE=ON \
|
-DUSE_DISCORD_PRESENCE=ON \
|
||||||
-DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
|
-DSUYU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
|
||||||
-DYUZU_USE_BUNDLED_FFMPEG=ON \
|
-DSUYU_USE_BUNDLED_FFMPEG=ON \
|
||||||
-DYUZU_ENABLE_LTO=ON \
|
-DSUYU_ENABLE_LTO=ON \
|
||||||
-DYUZU_CRASH_DUMPS=ON \
|
-DSUYU_CRASH_DUMPS=ON \
|
||||||
-GNinja
|
-GNinja
|
||||||
|
|
||||||
ninja
|
ninja
|
||||||
|
@ -33,7 +33,7 @@ ccache -s
|
||||||
ctest -VV -C Release
|
ctest -VV -C Release
|
||||||
|
|
||||||
# Separate debug symbols from specified executables
|
# Separate debug symbols from specified executables
|
||||||
for EXE in yuzu; do
|
for EXE in suyu; do
|
||||||
EXE_PATH="bin/$EXE"
|
EXE_PATH="bin/$EXE"
|
||||||
# Copy debug symbols out
|
# Copy debug symbols out
|
||||||
objcopy --only-keep-debug $EXE_PATH $EXE_PATH.debug
|
objcopy --only-keep-debug $EXE_PATH $EXE_PATH.debug
|
||||||
|
@ -46,7 +46,7 @@ done
|
||||||
find bin/ -type f -not -regex '.*.debug' -exec strip -g {} ';'
|
find bin/ -type f -not -regex '.*.debug' -exec strip -g {} ';'
|
||||||
|
|
||||||
DESTDIR="$PWD/AppDir" ninja install
|
DESTDIR="$PWD/AppDir" ninja install
|
||||||
rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester
|
rm -vf AppDir/usr/bin/suyu-cmd AppDir/usr/bin/suyu-tester
|
||||||
|
|
||||||
# Download tools needed to build an AppImage
|
# Download tools needed to build an AppImage
|
||||||
wget -nc https://gitlab.com/suyu-emu/ext-linux-bin/-/raw/main/appimage/deploy-linux.sh
|
wget -nc https://gitlab.com/suyu-emu/ext-linux-bin/-/raw/main/appimage/deploy-linux.sh
|
||||||
|
@ -66,13 +66,13 @@ mkdir -p AppDir/usr/optional
|
||||||
mkdir -p AppDir/usr/optional/libstdc++
|
mkdir -p AppDir/usr/optional/libstdc++
|
||||||
mkdir -p AppDir/usr/optional/libgcc_s
|
mkdir -p AppDir/usr/optional/libgcc_s
|
||||||
|
|
||||||
# Deploy yuzu's needed dependencies
|
# Deploy suyu's needed dependencies
|
||||||
DEPLOY_QT=1 ./deploy-linux.sh AppDir/usr/bin/yuzu AppDir
|
DEPLOY_QT=1 ./deploy-linux.sh AppDir/usr/bin/suyu AppDir
|
||||||
|
|
||||||
# Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems
|
# Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems
|
||||||
find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print
|
find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print
|
||||||
|
|
||||||
# Workaround for building yuzu with GCC 10 but also trying to distribute it to Ubuntu 18.04 et al.
|
# Workaround for building suyu with GCC 10 but also trying to distribute it to Ubuntu 18.04 et al.
|
||||||
# See https://github.com/darealshinji/AppImageKit-checkrt
|
# See https://github.com/darealshinji/AppImageKit-checkrt
|
||||||
cp exec-x86_64.so AppDir/usr/optional/exec.so
|
cp exec-x86_64.so AppDir/usr/optional/exec.so
|
||||||
cp AppRun.sh AppDir/AppRun
|
cp AppRun.sh AppDir/AppRun
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
|
|
||||||
mkdir -p "ccache" || true
|
mkdir -p "ccache" || true
|
||||||
chmod a+x ./.ci/scripts/linux/docker.sh
|
chmod a+x ./.ci/scripts/linux/docker.sh
|
||||||
# the UID for the container yuzu user is 1027
|
# the UID for the container suyu user is 1027
|
||||||
sudo chown -R 1027 ./
|
sudo chown -R 1027 ./
|
||||||
|
|
||||||
# The environment variables listed below:
|
# The environment variables listed below:
|
||||||
# AZURECIREPO TITLEBARFORMATIDLE TITLEBARFORMATRUNNING DISPLAYVERSION
|
# AZURECIREPO TITLEBARFORMATIDLE TITLEBARFORMATRUNNING DISPLAYVERSION
|
||||||
# are requested in src/common/CMakeLists.txt and appear to be provided somewhere in Azure DevOps
|
# are requested in src/common/CMakeLists.txt and appear to be provided somewhere in Azure DevOps
|
||||||
|
|
||||||
docker run -e AZURECIREPO -e TITLEBARFORMATIDLE -e TITLEBARFORMATRUNNING -e DISPLAYVERSION -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh "$1"
|
docker run -e AZURECIREPO -e TITLEBARFORMATIDLE -e TITLEBARFORMATRUNNING -e DISPLAYVERSION -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/suyu/ccache -v "$(pwd):/suyu" -w /suyu suyuemu/build-environments:linux-fresh /bin/bash /suyu/.ci/scripts/linux/docker.sh "$1"
|
||||||
sudo chown -R $UID ./
|
sudo chown -R $UID ./
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
. .ci/scripts/common/pre-upload.sh
|
. .ci/scripts/common/pre-upload.sh
|
||||||
|
|
||||||
APPIMAGE_NAME="yuzu-${RELEASE_NAME}-${GITDATE}-${GITREV}.AppImage"
|
APPIMAGE_NAME="suyu-${RELEASE_NAME}-${GITDATE}-${GITREV}.AppImage"
|
||||||
BASE_NAME="yuzu-linux"
|
BASE_NAME="suyu-linux"
|
||||||
REV_NAME="${BASE_NAME}-${GITDATE}-${GITREV}"
|
REV_NAME="${BASE_NAME}-${GITDATE}-${GITREV}"
|
||||||
ARCHIVE_NAME="${REV_NAME}.tar.xz"
|
ARCHIVE_NAME="${REV_NAME}.tar.xz"
|
||||||
COMPRESSION_FLAGS="-cJvf"
|
COMPRESSION_FLAGS="-cJvf"
|
||||||
|
@ -19,9 +19,9 @@ fi
|
||||||
|
|
||||||
mkdir "$DIR_NAME"
|
mkdir "$DIR_NAME"
|
||||||
|
|
||||||
cp build/bin/yuzu-cmd "$DIR_NAME"
|
cp build/bin/suyu-cmd "$DIR_NAME"
|
||||||
if [ "${RELEASE_NAME}" != "early-access" ] && [ "${RELEASE_NAME}" != "mainline" ]; then
|
if [ "${RELEASE_NAME}" != "early-access" ] && [ "${RELEASE_NAME}" != "mainline" ]; then
|
||||||
cp build/bin/yuzu "$DIR_NAME"
|
cp build/bin/suyu "$DIR_NAME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build an AppImage
|
# Build an AppImage
|
||||||
|
@ -42,7 +42,7 @@ fi
|
||||||
|
|
||||||
if [ "${RELEASE_NAME}" = "mainline" ]; then
|
if [ "${RELEASE_NAME}" = "mainline" ]; then
|
||||||
# Generate update information if releasing to mainline
|
# Generate update information if releasing to mainline
|
||||||
./appimagetool-x86_64.AppImage -u "gh-releases-zsync|yuzu-emu|yuzu-${RELEASE_NAME}|latest|yuzu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}"
|
./appimagetool-x86_64.AppImage -u "gh-releases-zsync|suyu-emu|suyu-${RELEASE_NAME}|latest|suyu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}"
|
||||||
else
|
else
|
||||||
./appimagetool-x86_64.AppImage AppDir "${APPIMAGE_NAME}"
|
./appimagetool-x86_64.AppImage AppDir "${APPIMAGE_NAME}"
|
||||||
fi
|
fi
|
||||||
|
@ -56,7 +56,7 @@ fi
|
||||||
|
|
||||||
# Copy the AppImage to the general release directory and remove git revision info
|
# Copy the AppImage to the general release directory and remove git revision info
|
||||||
if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
|
if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
|
||||||
cp "build/${APPIMAGE_NAME}" "${DIR_NAME}/yuzu-${RELEASE_NAME}.AppImage"
|
cp "build/${APPIMAGE_NAME}" "${DIR_NAME}/suyu-${RELEASE_NAME}.AppImage"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Copy debug symbols to artifacts
|
# Copy debug symbols to artifacts
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
import requests, sys, json, shutil, subprocess, os, traceback
|
import requests, sys, json, shutil, subprocess, os, traceback
|
||||||
|
|
||||||
org = os.getenv("PRIVATEMERGEORG", "yuzu-emu")
|
org = os.getenv("PRIVATEMERGEORG", "suyu-emu")
|
||||||
repo = os.getenv("PRIVATEMERGEREPO", "yuzu-private")
|
repo = os.getenv("PRIVATEMERGEREPO", "suyu-private")
|
||||||
tagline = sys.argv[3]
|
tagline = sys.argv[3]
|
||||||
user = sys.argv[1]
|
user = sys.argv[1]
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ def check_individual(labels):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def do_page(page):
|
def do_page(page):
|
||||||
url = f"https://api.github.com/repos/yuzu-emu/yuzu/pulls?page={page}"
|
url = f"https://gitlab.com/suyu-emu/suyu/-/merge_requests?page={page}"
|
||||||
response = requests.get(url)
|
response = requests.get(url)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
if (response.ok):
|
if (response.ok):
|
||||||
|
@ -26,7 +26,7 @@ def do_page(page):
|
||||||
if (check_individual(pr["labels"])):
|
if (check_individual(pr["labels"])):
|
||||||
pn = pr["number"]
|
pn = pr["number"]
|
||||||
print(f"Matched PR# {pn}")
|
print(f"Matched PR# {pn}")
|
||||||
print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"]))
|
print(subprocess.check_output(["git", "fetch", "https://gitlab.com/suyu-emu/suyu.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"]))
|
||||||
print(subprocess.check_output(["git", "merge", "--squash", f"pr-{pn}"]))
|
print(subprocess.check_output(["git", "merge", "--squash", f"pr-{pn}"]))
|
||||||
print(subprocess.check_output(["git", "commit", f"-m\"Merge {tagline} PR {pn}\""]))
|
print(subprocess.check_output(["git", "commit", f"-m\"Merge {tagline} PR {pn}\""]))
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
import requests, json, sys
|
import requests, json, sys
|
||||||
|
|
||||||
try:
|
try:
|
||||||
url = 'https://api.github.com/repos/yuzu-emu/yuzu/issues/%s' % sys.argv[1]
|
url = 'https://gitlab.com/suyu-emu/suyu/-/issues/%s' % sys.argv[1]
|
||||||
response = requests.get(url)
|
response = requests.get(url)
|
||||||
if (response.ok):
|
if (response.ok):
|
||||||
j = json.loads(response.content)
|
j = json.loads(response.content)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
git config --global user.email "yuzu@yuzu-emu.org"
|
git config --global user.email "suyu@suyu.dev"
|
||||||
git config --global user.name "yuzubot"
|
git config --global user.name "suyubot"
|
|
@ -11,7 +11,7 @@ gcc -v
|
||||||
tx --version
|
tx --version
|
||||||
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_VCPKG=ON
|
cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF -DSUYU_TESTS=OFF -DSUYU_USE_BUNDLED_VCPKG=ON
|
||||||
make translation
|
make translation
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#!/bin/bash -ex
|
#!/bin/bash -ex
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
#cd /yuzu
|
#cd /suyu
|
||||||
|
|
||||||
ccache -sv
|
ccache -sv
|
||||||
|
|
||||||
|
@ -17,11 +17,11 @@ cmake .. \
|
||||||
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
|
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
|
||||||
-DENABLE_QT_TRANSLATION=ON \
|
-DENABLE_QT_TRANSLATION=ON \
|
||||||
-DUSE_CCACHE=ON \
|
-DUSE_CCACHE=ON \
|
||||||
-DYUZU_USE_BUNDLED_SDL2=OFF \
|
-DSUYU_USE_BUNDLED_SDL2=OFF \
|
||||||
-DYUZU_USE_EXTERNAL_SDL2=OFF \
|
-DSUYU_USE_EXTERNAL_SDL2=OFF \
|
||||||
-DYUZU_TESTS=OFF \
|
-DSUYU_TESTS=OFF \
|
||||||
-GNinja
|
-GNinja
|
||||||
ninja yuzu yuzu-cmd
|
ninja suyu suyu-cmd
|
||||||
|
|
||||||
ccache -sv
|
ccache -sv
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ else
|
||||||
QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins'
|
QT_PLUGINS_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find build/ -name "yuzu*.exe" -exec cp {} 'package' \;
|
find build/ -name "suyu*.exe" -exec cp {} 'package' \;
|
||||||
|
|
||||||
# copy Qt plugins
|
# copy Qt plugins
|
||||||
mkdir package/platforms
|
mkdir package/platforms
|
||||||
|
@ -62,5 +62,5 @@ EXTERNALS_PATH="$(pwd)/build/externals"
|
||||||
FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin"
|
FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin"
|
||||||
find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -nv {} package/ ';'
|
find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -nv {} package/ ';'
|
||||||
|
|
||||||
# copy libraries from yuzu.exe path
|
# copy libraries from suyu.exe path
|
||||||
find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';'
|
find "$(pwd)/build/bin/" -type f -regex ".*\.dll" -exec cp -v {} package/ ';'
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
mkdir -p "ccache" || true
|
mkdir -p "ccache" || true
|
||||||
chmod a+x ./.ci/scripts/windows/docker.sh
|
chmod a+x ./.ci/scripts/windows/docker.sh
|
||||||
# the UID for the container yuzu user is 1027
|
# the UID for the container suyu user is 1027
|
||||||
sudo chown -R 1027 ./
|
sudo chown -R 1027 ./
|
||||||
docker run -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh "$1"
|
docker run -e CCACHE_DIR=/suyu/ccache -v "$(pwd):/suyu" -w /suyu suyuemu/build-environments:linux-mingw /bin/bash -ex /suyu/.ci/scripts/windows/docker.sh "$1"
|
||||||
sudo chown -R $UID ./
|
sudo chown -R $UID ./
|
||||||
|
|
|
@ -7,18 +7,18 @@ $GITDATE = $(git show -s --date=short --format='%ad') -replace "-", ""
|
||||||
$GITREV = $(git show -s --format='%h')
|
$GITREV = $(git show -s --format='%h')
|
||||||
|
|
||||||
if ("$BUILD_NAME" -eq "mainline") {
|
if ("$BUILD_NAME" -eq "mainline") {
|
||||||
$RELEASE_DIST = "yuzu-windows-msvc"
|
$RELEASE_DIST = "suyu-windows-msvc"
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$RELEASE_DIST = "yuzu-windows-msvc-$BUILD_NAME"
|
$RELEASE_DIST = "suyu-windows-msvc-$BUILD_NAME"
|
||||||
}
|
}
|
||||||
|
|
||||||
$MSVC_BUILD_ZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
|
$MSVC_BUILD_ZIP = "suyu-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
|
||||||
$MSVC_BUILD_PDB = "yuzu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", ""
|
$MSVC_BUILD_PDB = "suyu-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", ""
|
||||||
$MSVC_SEVENZIP = "yuzu-windows-msvc-$GITDATE-$GITREV.7z" -replace " ", ""
|
$MSVC_SEVENZIP = "suyu-windows-msvc-$GITDATE-$GITREV.7z" -replace " ", ""
|
||||||
$MSVC_TAR = "yuzu-windows-msvc-$GITDATE-$GITREV.tar" -replace " ", ""
|
$MSVC_TAR = "suyu-windows-msvc-$GITDATE-$GITREV.tar" -replace " ", ""
|
||||||
$MSVC_TARXZ = "yuzu-windows-msvc-$GITDATE-$GITREV.tar.xz" -replace " ", ""
|
$MSVC_TARXZ = "suyu-windows-msvc-$GITDATE-$GITREV.tar.xz" -replace " ", ""
|
||||||
$MSVC_SOURCE = "yuzu-windows-msvc-source-$GITDATE-$GITREV" -replace " ", ""
|
$MSVC_SOURCE = "suyu-windows-msvc-source-$GITDATE-$GITREV" -replace " ", ""
|
||||||
$MSVC_SOURCE_TAR = "$MSVC_SOURCE.tar"
|
$MSVC_SOURCE_TAR = "$MSVC_SOURCE.tar"
|
||||||
$MSVC_SOURCE_TARXZ = "$MSVC_SOURCE_TAR.xz"
|
$MSVC_SOURCE_TARXZ = "$MSVC_SOURCE_TAR.xz"
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ if ("$env:GITHUB_ACTIONS" -eq "true") {
|
||||||
cp .\build\bin\*.dll .\artifacts\
|
cp .\build\bin\*.dll .\artifacts\
|
||||||
|
|
||||||
# Hopefully there is an exe in either .\build\bin or .\build\bin\Release
|
# Hopefully there is an exe in either .\build\bin or .\build\bin\Release
|
||||||
cp .\build\bin\yuzu*.exe .\artifacts\
|
cp .\build\bin\suyu*.exe .\artifacts\
|
||||||
Copy-Item "$BUILD_DIR\*" -Destination "artifacts" -Recurse
|
Copy-Item "$BUILD_DIR\*" -Destination "artifacts" -Recurse
|
||||||
Remove-Item .\artifacts\tests.exe -ErrorAction ignore
|
Remove-Item .\artifacts\tests.exe -ErrorAction ignore
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ if ("$env:GITHUB_ACTIONS" -eq "true") {
|
||||||
#Copy-Item $MSVC_SOURCE_TARXZ -Destination "artifacts"
|
#Copy-Item $MSVC_SOURCE_TARXZ -Destination "artifacts"
|
||||||
|
|
||||||
# Debugging symbols
|
# Debugging symbols
|
||||||
cp .\build\bin\yuzu*.pdb .\artifacts\
|
cp .\build\bin\suyu*.pdb .\artifacts\
|
||||||
|
|
||||||
# Write out a tag BUILD_TAG to environment for the Upload step
|
# Write out a tag BUILD_TAG to environment for the Upload step
|
||||||
# We're getting ${{ github.event.number }} as $env:PR_NUMBER"
|
# We're getting ${{ github.event.number }} as $env:PR_NUMBER"
|
||||||
|
@ -91,11 +91,11 @@ if ("$env:GITHUB_ACTIONS" -eq "true") {
|
||||||
echo "BUILD_TAG=$BUILD_TAG" >> $env:GITHUB_ENV
|
echo "BUILD_TAG=$BUILD_TAG" >> $env:GITHUB_ENV
|
||||||
|
|
||||||
# For extra job, just the exe
|
# For extra job, just the exe
|
||||||
$INDIVIDUAL_EXE = "yuzu-msvc-$BUILD_TAG.exe"
|
$INDIVIDUAL_EXE = "suyu-msvc-$BUILD_TAG.exe"
|
||||||
echo "INDIVIDUAL_EXE=$INDIVIDUAL_EXE"
|
echo "INDIVIDUAL_EXE=$INDIVIDUAL_EXE"
|
||||||
echo "INDIVIDUAL_EXE=$INDIVIDUAL_EXE" >> $env:GITHUB_ENV
|
echo "INDIVIDUAL_EXE=$INDIVIDUAL_EXE" >> $env:GITHUB_ENV
|
||||||
echo "Just the exe: $INDIVIDUAL_EXE"
|
echo "Just the exe: $INDIVIDUAL_EXE"
|
||||||
cp .\artifacts\yuzu.exe .\$INDIVIDUAL_EXE
|
cp .\artifacts\suyu.exe .\$INDIVIDUAL_EXE
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -104,7 +104,7 @@ if ("$env:GITHUB_ACTIONS" -eq "true") {
|
||||||
Copy-Item $MSVC_SOURCE_TARXZ -Destination $RELEASE_DIST
|
Copy-Item $MSVC_SOURCE_TARXZ -Destination $RELEASE_DIST
|
||||||
Copy-Item "$BUILD_DIR\*" -Destination $RELEASE_DIST -Recurse
|
Copy-Item "$BUILD_DIR\*" -Destination $RELEASE_DIST -Recurse
|
||||||
rm "$RELEASE_DIST\*.exe"
|
rm "$RELEASE_DIST\*.exe"
|
||||||
Get-ChildItem "$BUILD_DIR" -Recurse -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST
|
Get-ChildItem "$BUILD_DIR" -Recurse -Filter "suyu*.exe" | Copy-Item -destination $RELEASE_DIST
|
||||||
Get-ChildItem "$BUILD_DIR" -Recurse -Filter "QtWebEngineProcess*.exe" | Copy-Item -destination $RELEASE_DIST
|
Get-ChildItem "$BUILD_DIR" -Recurse -Filter "QtWebEngineProcess*.exe" | Copy-Item -destination $RELEASE_DIST
|
||||||
7z a -tzip $MSVC_BUILD_ZIP $RELEASE_DIST\*
|
7z a -tzip $MSVC_BUILD_ZIP $RELEASE_DIST\*
|
||||||
7z a $MSVC_SEVENZIP $RELEASE_DIST
|
7z a $MSVC_SEVENZIP $RELEASE_DIST
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
. .ci/scripts/common/pre-upload.sh
|
. .ci/scripts/common/pre-upload.sh
|
||||||
|
|
||||||
REV_NAME="yuzu-windows-mingw-${GITDATE}-${GITREV}"
|
REV_NAME="suyu-windows-mingw-${GITDATE}-${GITREV}"
|
||||||
ARCHIVE_NAME="${REV_NAME}.tar.xz"
|
ARCHIVE_NAME="${REV_NAME}.tar.xz"
|
||||||
COMPRESSION_FLAGS="-cJvf"
|
COMPRESSION_FLAGS="-cJvf"
|
||||||
|
|
||||||
|
|
|
@ -4,5 +4,5 @@
|
||||||
steps:
|
steps:
|
||||||
- script: mkdir artifacts || echo 'X' > artifacts/T1.txt
|
- script: mkdir artifacts || echo 'X' > artifacts/T1.txt
|
||||||
- publish: artifacts
|
- publish: artifacts
|
||||||
artifact: 'yuzu-$(BuildName)-mock'
|
artifact: 'suyu-$(BuildName)-mock'
|
||||||
displayName: 'Upload Artifacts'
|
displayName: 'Upload Artifacts'
|
|
@ -12,12 +12,12 @@ steps:
|
||||||
inputs:
|
inputs:
|
||||||
targetType: 'filePath'
|
targetType: 'filePath'
|
||||||
filePath: './.ci/scripts/windows/install-vulkan-sdk.ps1'
|
filePath: './.ci/scripts/windows/install-vulkan-sdk.ps1'
|
||||||
- script: refreshenv && glslangValidator --version && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DYUZU_ENABLE_LTO=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DYUZU_CRASH_DUMPS=ON .. && cd ..
|
- script: refreshenv && glslangValidator --version && mkdir build && cd build && cmake -E env CXXFLAGS="/Gw" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DSUYU_ENABLE_LTO=ON -DSUYU_USE_BUNDLED_QT=1 -DSUYU_USE_BUNDLED_SDL2=1 -DSUYU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DSUYU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DSUYU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release -DSUYU_CRASH_DUMPS=ON .. && cd ..
|
||||||
displayName: 'Configure CMake'
|
displayName: 'Configure CMake'
|
||||||
- task: MSBuild@1
|
- task: MSBuild@1
|
||||||
displayName: 'Build'
|
displayName: 'Build'
|
||||||
inputs:
|
inputs:
|
||||||
solution: 'build/yuzu.sln'
|
solution: 'build/suyu.sln'
|
||||||
maximumCpuCount: true
|
maximumCpuCount: true
|
||||||
configuration: release
|
configuration: release
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
|
@ -27,5 +27,5 @@ steps:
|
||||||
filePath: './.ci/scripts/windows/upload.ps1'
|
filePath: './.ci/scripts/windows/upload.ps1'
|
||||||
arguments: '$(BuildName)'
|
arguments: '$(BuildName)'
|
||||||
- publish: artifacts
|
- publish: artifacts
|
||||||
artifact: 'yuzu-$(BuildName)-windows-msvc'
|
artifact: 'suyu-$(BuildName)-windows-msvc'
|
||||||
displayName: 'Upload Artifacts'
|
displayName: 'Upload Artifacts'
|
||||||
|
|
|
@ -14,7 +14,7 @@ steps:
|
||||||
- task: CacheBeta@0
|
- task: CacheBeta@0
|
||||||
displayName: 'Cache Build System'
|
displayName: 'Cache Build System'
|
||||||
inputs:
|
inputs:
|
||||||
key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix)
|
key: suyu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix)
|
||||||
path: $(System.DefaultWorkingDirectory)/ccache
|
path: $(System.DefaultWorkingDirectory)/ccache
|
||||||
cacheHitVar: CACHE_RESTORED
|
cacheHitVar: CACHE_RESTORED
|
||||||
- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh ${{ parameters['version'] }}
|
- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh ${{ parameters['version'] }}
|
||||||
|
@ -22,5 +22,5 @@ steps:
|
||||||
- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh
|
- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh
|
||||||
displayName: 'Package Artifacts'
|
displayName: 'Package Artifacts'
|
||||||
- publish: artifacts
|
- publish: artifacts
|
||||||
artifact: 'yuzu-$(BuildName)-$(BuildSuffix)'
|
artifact: 'suyu-$(BuildName)-$(BuildSuffix)'
|
||||||
displayName: 'Upload Artifacts'
|
displayName: 'Upload Artifacts'
|
||||||
|
|
|
@ -19,12 +19,12 @@ jobs:
|
||||||
rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
|
rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
|
||||||
includeRootFolder: false
|
includeRootFolder: false
|
||||||
archiveType: '7z'
|
archiveType: '7z'
|
||||||
archiveFile: '$(Build.ArtifactStagingDirectory)/yuzu-$(BuildName)-source.7z'
|
archiveFile: '$(Build.ArtifactStagingDirectory)/suyu-$(BuildName)-source.7z'
|
||||||
- task: PublishPipelineArtifact@1
|
- task: PublishPipelineArtifact@1
|
||||||
displayName: 'Upload Artifacts'
|
displayName: 'Upload Artifacts'
|
||||||
inputs:
|
inputs:
|
||||||
targetPath: '$(Build.ArtifactStagingDirectory)/yuzu-$(BuildName)-source.7z'
|
targetPath: '$(Build.ArtifactStagingDirectory)/suyu-$(BuildName)-source.7z'
|
||||||
artifact: 'yuzu-$(BuildName)-source'
|
artifact: 'suyu-$(BuildName)-source'
|
||||||
replaceExistingArchive: true
|
replaceExistingArchive: true
|
||||||
- job: upload_source
|
- job: upload_source
|
||||||
displayName: 'upload'
|
displayName: 'upload'
|
||||||
|
@ -36,7 +36,7 @@ jobs:
|
||||||
parameters:
|
parameters:
|
||||||
artifactSource: 'true'
|
artifactSource: 'true'
|
||||||
needSubmodules: 'true'
|
needSubmodules: 'true'
|
||||||
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
|
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh
|
||||||
displayName: 'Apply Git Configuration'
|
displayName: 'Apply Git Configuration'
|
||||||
- script: git remote add other $(GitRepoPushChangesURL)
|
- script: git remote add other $(GitRepoPushChangesURL)
|
||||||
displayName: 'Register Repository'
|
displayName: 'Register Repository'
|
||||||
|
|
|
@ -18,12 +18,12 @@ jobs:
|
||||||
rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
|
rootFolderOrFile: '$(System.DefaultWorkingDirectory)'
|
||||||
includeRootFolder: false
|
includeRootFolder: false
|
||||||
archiveType: '7z'
|
archiveType: '7z'
|
||||||
archiveFile: '$(Build.ArtifactStagingDirectory)/yuzu-$(BuildName)-source.7z'
|
archiveFile: '$(Build.ArtifactStagingDirectory)/suyu-$(BuildName)-source.7z'
|
||||||
- task: PublishPipelineArtifact@1
|
- task: PublishPipelineArtifact@1
|
||||||
displayName: 'Upload Artifacts'
|
displayName: 'Upload Artifacts'
|
||||||
inputs:
|
inputs:
|
||||||
targetPath: '$(Build.ArtifactStagingDirectory)/yuzu-$(BuildName)-source.7z'
|
targetPath: '$(Build.ArtifactStagingDirectory)/suyu-$(BuildName)-source.7z'
|
||||||
artifact: 'yuzu-$(BuildName)-source'
|
artifact: 'suyu-$(BuildName)-source'
|
||||||
replaceExistingArchive: true
|
replaceExistingArchive: true
|
||||||
- job: upload_source
|
- job: upload_source
|
||||||
displayName: 'upload'
|
displayName: 'upload'
|
||||||
|
@ -35,7 +35,7 @@ jobs:
|
||||||
parameters:
|
parameters:
|
||||||
artifactSource: 'true'
|
artifactSource: 'true'
|
||||||
needSubmodules: 'true'
|
needSubmodules: 'true'
|
||||||
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
|
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh
|
||||||
displayName: 'Apply Git Configuration'
|
displayName: 'Apply Git Configuration'
|
||||||
- script: git remote add other $(GitRepoPushChangesURL)
|
- script: git remote add other $(GitRepoPushChangesURL)
|
||||||
displayName: 'Register Repository'
|
displayName: 'Register Repository'
|
||||||
|
|
|
@ -8,7 +8,7 @@ parameters:
|
||||||
steps:
|
steps:
|
||||||
- script: mkdir $(System.DefaultWorkingDirectory)/patches && pip install requests urllib3
|
- script: mkdir $(System.DefaultWorkingDirectory)/patches && pip install requests urllib3
|
||||||
displayName: 'Prepare Environment'
|
displayName: 'Prepare Environment'
|
||||||
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
|
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh
|
||||||
displayName: 'Apply Git Configuration'
|
displayName: 'Apply Git Configuration'
|
||||||
- task: PythonScript@0
|
- task: PythonScript@0
|
||||||
displayName: 'Discover, Download, and Apply Patches (Mainline)'
|
displayName: 'Discover, Download, and Apply Patches (Mainline)'
|
||||||
|
|
|
@ -7,7 +7,7 @@ parameters:
|
||||||
steps:
|
steps:
|
||||||
- script: mkdir $(System.DefaultWorkingDirectory)/patches && pip install requests urllib3
|
- script: mkdir $(System.DefaultWorkingDirectory)/patches && pip install requests urllib3
|
||||||
displayName: 'Prepare Environment'
|
displayName: 'Prepare Environment'
|
||||||
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
|
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh
|
||||||
displayName: 'Apply Git Configuration'
|
displayName: 'Apply Git Configuration'
|
||||||
- task: PythonScript@0
|
- task: PythonScript@0
|
||||||
displayName: 'Discover, Download, and Apply Patches'
|
displayName: 'Discover, Download, and Apply Patches'
|
||||||
|
|
|
@ -5,12 +5,12 @@ steps:
|
||||||
- task: DownloadPipelineArtifact@2
|
- task: DownloadPipelineArtifact@2
|
||||||
displayName: 'Download Windows Release'
|
displayName: 'Download Windows Release'
|
||||||
inputs:
|
inputs:
|
||||||
artifactName: 'yuzu-$(BuildName)-windows-msvc'
|
artifactName: 'suyu-$(BuildName)-windows-msvc'
|
||||||
buildType: 'current'
|
buildType: 'current'
|
||||||
targetPath: '$(Build.ArtifactStagingDirectory)'
|
targetPath: '$(Build.ArtifactStagingDirectory)'
|
||||||
- task: DownloadPipelineArtifact@2
|
- task: DownloadPipelineArtifact@2
|
||||||
displayName: 'Download Linux Release'
|
displayName: 'Download Linux Release'
|
||||||
inputs:
|
inputs:
|
||||||
artifactName: 'yuzu-$(BuildName)-linux'
|
artifactName: 'suyu-$(BuildName)-linux'
|
||||||
buildType: 'current'
|
buildType: 'current'
|
||||||
targetPath: '$(Build.ArtifactStagingDirectory)'
|
targetPath: '$(Build.ArtifactStagingDirectory)'
|
|
@ -2,9 +2,9 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh
|
- script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/suyubot-git-config.sh
|
||||||
displayName: 'Apply Git Configuration'
|
displayName: 'Apply Git Configuration'
|
||||||
- script: git tag -a $(BuildName)-$(DisplayPrefix)-$(DisplayVersion) -m "yuzu $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName) $(DisplayPrefix)-$(DisplayVersion)"
|
- script: git tag -a $(BuildName)-$(DisplayPrefix)-$(DisplayVersion) -m "suyu $(BuildName) $(Build.BuildNumber) $(Build.DefinitionName) $(DisplayPrefix)-$(DisplayVersion)"
|
||||||
displayName: 'Tag Source'
|
displayName: 'Tag Source'
|
||||||
- script: git remote add other $(GitRepoPushChangesURL)
|
- script: git remote add other $(GitRepoPushChangesURL)
|
||||||
displayName: 'Register Repository'
|
displayName: 'Register Repository'
|
||||||
|
|
|
@ -8,6 +8,6 @@ steps:
|
||||||
inputs:
|
inputs:
|
||||||
command: publish
|
command: publish
|
||||||
publishDirectory: '$(Build.ArtifactStagingDirectory)'
|
publishDirectory: '$(Build.ArtifactStagingDirectory)'
|
||||||
vstsFeedPublish: 'yuzu-$(BuildName)'
|
vstsFeedPublish: 'suyu-$(BuildName)'
|
||||||
vstsFeedPackagePublish: 'main'
|
vstsFeedPackagePublish: 'main'
|
||||||
packagePublishDescription: 'Yuzu Windows and Linux Executable Packages'
|
packagePublishDescription: 'Suyu Windows and Linux Executable Packages'
|
|
@ -6,7 +6,7 @@ steps:
|
||||||
- task: DownloadPipelineArtifact@2
|
- task: DownloadPipelineArtifact@2
|
||||||
displayName: 'Download Source'
|
displayName: 'Download Source'
|
||||||
inputs:
|
inputs:
|
||||||
artifactName: 'yuzu-$(BuildName)-source'
|
artifactName: 'suyu-$(BuildName)-source'
|
||||||
buildType: 'current'
|
buildType: 'current'
|
||||||
targetPath: '$(Build.ArtifactStagingDirectory)'
|
targetPath: '$(Build.ArtifactStagingDirectory)'
|
||||||
- script: rm -rf $(System.DefaultWorkingDirectory) && mkdir $(System.DefaultWorkingDirectory)
|
- script: rm -rf $(System.DefaultWorkingDirectory) && mkdir $(System.DefaultWorkingDirectory)
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
- master
|
|
||||||
|
|
||||||
pool:
|
|
||||||
vmImage: 'ubuntu-latest'
|
|
||||||
|
|
||||||
stages:
|
|
||||||
- stage: merge
|
|
||||||
displayName: 'merge'
|
|
||||||
jobs:
|
|
||||||
- template: ./templates/merge-private.yml
|
|
|
@ -1,59 +0,0 @@
|
||||||
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
- master
|
|
||||||
|
|
||||||
variables:
|
|
||||||
DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]
|
|
||||||
|
|
||||||
stages:
|
|
||||||
- stage: build
|
|
||||||
displayName: 'build'
|
|
||||||
jobs:
|
|
||||||
- job: linux
|
|
||||||
timeoutInMinutes: 120
|
|
||||||
displayName: 'linux'
|
|
||||||
pool:
|
|
||||||
vmImage: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
maxParallel: 10
|
|
||||||
matrix:
|
|
||||||
linux:
|
|
||||||
BuildSuffix: 'linux'
|
|
||||||
ScriptFolder: 'linux'
|
|
||||||
steps:
|
|
||||||
- template: ./templates/sync-source.yml
|
|
||||||
parameters:
|
|
||||||
artifactSource: $(parameters.artifactSource)
|
|
||||||
needSubmodules: 'true'
|
|
||||||
- template: ./templates/build-single.yml
|
|
||||||
parameters:
|
|
||||||
artifactSource: 'false'
|
|
||||||
cache: $(parameters.cache)
|
|
||||||
version: $(DisplayVersion)
|
|
||||||
- job: msvc
|
|
||||||
timeoutInMinutes: 120
|
|
||||||
displayName: 'windows'
|
|
||||||
pool:
|
|
||||||
vmImage: windows-2022
|
|
||||||
steps:
|
|
||||||
- template: ./templates/sync-source.yml
|
|
||||||
parameters:
|
|
||||||
artifactSource: $(parameters.artifactSource)
|
|
||||||
needSubmodules: 'true'
|
|
||||||
- template: ./templates/build-msvc.yml
|
|
||||||
parameters:
|
|
||||||
artifactSource: 'false'
|
|
||||||
cache: $(parameters.cache)
|
|
||||||
version: $(DisplayVersion)
|
|
||||||
- stage: release
|
|
||||||
displayName: 'release'
|
|
||||||
dependsOn: build
|
|
||||||
jobs:
|
|
||||||
- job: release
|
|
||||||
displayName: 'source'
|
|
||||||
pool:
|
|
||||||
vmImage: 'ubuntu-latest'
|
|
||||||
steps:
|
|
||||||
- template: ./templates/release-private-tag.yml
|
|
|
@ -3,4 +3,4 @@
|
||||||
|
|
||||||
# These are supported funding model platforms
|
# These are supported funding model platforms
|
||||||
|
|
||||||
patreon: yuzuteam
|
patreon: suyuteam
|
||||||
|
|
|
@ -3,7 +3,7 @@ description: File a bug report
|
||||||
body:
|
body:
|
||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with yuzu.
|
value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with suyu.
|
||||||
- type: checkboxes
|
- type: checkboxes
|
||||||
attributes:
|
attributes:
|
||||||
label: Is there an existing issue for this?
|
label: Is there an existing issue for this?
|
||||||
|
@ -43,7 +43,7 @@ body:
|
||||||
id: log
|
id: log
|
||||||
attributes:
|
attributes:
|
||||||
label: Log File
|
label: Log File
|
||||||
description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://yuzu-emu.org/help/reference/log-files).
|
description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://suyu.dev/help/reference/log-files).
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
- type: textarea
|
- type: textarea
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
blank_issues_enabled: false
|
blank_issues_enabled: false
|
||||||
contact_links:
|
contact_links:
|
||||||
- name: yuzu Discord
|
- name: suyu Discord
|
||||||
url: https://discord.com/invite/u77vRWY
|
url: https://discord.com/invite/suyu
|
||||||
about: If you are experiencing an issue with yuzu, and you need tech support, or if you have a general question, try asking in the official yuzu Discord linked here. Piracy is not allowed.
|
about: If you are experiencing an issue with suyu, and you need tech support, or if you have a general question, try asking in the official suyu Discord linked here. Piracy is not allowed.
|
||||||
- name: Community forums
|
|
||||||
url: https://community.citra-emu.org
|
|
||||||
about: This is an alternative place for tech support, however helpers there are not as active.
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ labels: "request"
|
||||||
body:
|
body:
|
||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make yuzu better.
|
value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make suyu better.
|
||||||
- type: checkboxes
|
- type: checkboxes
|
||||||
attributes:
|
attributes:
|
||||||
label: Is there an existing issue for this?
|
label: Is there an existing issue for this?
|
||||||
|
@ -23,6 +23,6 @@ body:
|
||||||
id: why-feature
|
id: why-feature
|
||||||
attributes:
|
attributes:
|
||||||
label: Why would this feature be useful?
|
label: Why would this feature be useful?
|
||||||
description: A brief description of why this feature would make yuzu better.
|
description: A brief description of why this feature would make suyu better.
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
name: 'yuzu-android-build'
|
name: 'suyu-android-build'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
@ -10,7 +10,7 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
android:
|
android:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.repository == 'yuzu-emu/yuzu-android' }}
|
if: ${{ github.repository == 'suyu-emu/suyu-android' }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
name: yuzu-android-ea-play-release
|
name: suyu-android-ea-play-release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
@ -14,7 +14,7 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
android:
|
android:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.repository == 'yuzu-emu/yuzu' }}
|
if: ${{ github.repository == 'suyu-emu/suyu' }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
name: Checkout
|
name: Checkout
|
||||||
|
@ -62,5 +62,5 @@ jobs:
|
||||||
name: ${{ env.EA_TAG_NAME }}
|
name: ${{ env.EA_TAG_NAME }}
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: false
|
||||||
repository: yuzu/yuzu-android
|
repository: suyu/suyu-android
|
||||||
token: ${{ secrets.ALT_GITHUB_TOKEN }}
|
token: ${{ secrets.ALT_GITHUB_TOKEN }}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
name: yuzu-android-mainline-play-release
|
name: suyu-android-mainline-play-release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
release-tag:
|
release-tag:
|
||||||
description: 'Tag # from yuzu-android that you want to build and publish'
|
description: 'Tag # from suyu-android that you want to build and publish'
|
||||||
required: true
|
required: true
|
||||||
default: '200'
|
default: '200'
|
||||||
release-track:
|
release-track:
|
||||||
|
@ -18,7 +18,7 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
android:
|
android:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.repository == 'yuzu-emu/yuzu' }}
|
if: ${{ github.repository == 'suyu-emu/suyu' }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
name: Checkout
|
name: Checkout
|
||||||
|
|
|
@ -25,8 +25,8 @@ async function checkBaseChanges(github) {
|
||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
const variables = {
|
const variables = {
|
||||||
owner: 'yuzu-emu',
|
owner: 'suyu-emu',
|
||||||
name: 'yuzu',
|
name: 'suyu',
|
||||||
ref: 'refs/heads/master',
|
ref: 'refs/heads/master',
|
||||||
};
|
};
|
||||||
const result = await github.graphql(query, variables);
|
const result = await github.graphql(query, variables);
|
||||||
|
@ -126,7 +126,7 @@ async function tagAndPushEA(github, owner, repo, execa) {
|
||||||
const newTag = `ea-${tagNumber + 1}`;
|
const newTag = `ea-${tagNumber + 1}`;
|
||||||
console.log(`New tag: ${newTag}`);
|
console.log(`New tag: ${newTag}`);
|
||||||
console.info('Pushing tags to GitHub ...');
|
console.info('Pushing tags to GitHub ...');
|
||||||
await execa("git", ["remote", "add", "android", "https://github.com/yuzu-emu/yuzu-android.git"]);
|
await execa("git", ["remote", "add", "android", "https://gitlab.com/suyu-emu/suyu-android.git"]);
|
||||||
await execa("git", ["fetch", "android"]);
|
await execa("git", ["fetch", "android"]);
|
||||||
|
|
||||||
await execa("git", ['tag', newTag]);
|
await execa("git", ['tag', newTag]);
|
||||||
|
@ -174,12 +174,12 @@ async function fetchPullRequests(pulls, repoUrl, execa) {
|
||||||
async function mergePullRequests(pulls, execa) {
|
async function mergePullRequests(pulls, execa) {
|
||||||
let mergeResults = {};
|
let mergeResults = {};
|
||||||
console.log("::group::Merge pull requests");
|
console.log("::group::Merge pull requests");
|
||||||
await execa("git", ["config", "--global", "user.name", "yuzubot"]);
|
await execa("git", ["config", "--global", "user.name", "suyubot"]);
|
||||||
await execa("git", [
|
await execa("git", [
|
||||||
"config",
|
"config",
|
||||||
"--global",
|
"--global",
|
||||||
"user.email",
|
"user.email",
|
||||||
"yuzu\x40yuzu-emu\x2eorg", // prevent email harvesters from scraping the address
|
"suyu\x40suyu-emu\x2eorg", // prevent email harvesters from scraping the address
|
||||||
]);
|
]);
|
||||||
let hasFailed = false;
|
let hasFailed = false;
|
||||||
for (let pull of pulls) {
|
for (let pull of pulls) {
|
||||||
|
@ -195,7 +195,7 @@ async function mergePullRequests(pulls, execa) {
|
||||||
process1.stdout.pipe(process.stdout);
|
process1.stdout.pipe(process.stdout);
|
||||||
await process1;
|
await process1;
|
||||||
|
|
||||||
const process2 = execa("git", ["commit", "-m", `Merge yuzu-emu#${pr}`]);
|
const process2 = execa("git", ["commit", "-m", `Merge suyu-emu#${pr}`]);
|
||||||
process2.stdout.pipe(process.stdout);
|
process2.stdout.pipe(process.stdout);
|
||||||
await process2;
|
await process2;
|
||||||
|
|
||||||
|
@ -224,7 +224,7 @@ async function resetBranch(execa) {
|
||||||
console.log("::group::Reset master branch");
|
console.log("::group::Reset master branch");
|
||||||
let hasFailed = false;
|
let hasFailed = false;
|
||||||
try {
|
try {
|
||||||
await execa("git", ["remote", "add", "source", "https://github.com/yuzu-emu/yuzu.git"]);
|
await execa("git", ["remote", "add", "source", "https://gitlab.com/suyu-emu/suyu.git"]);
|
||||||
await execa("git", ["fetch", "source"]);
|
await execa("git", ["fetch", "source"]);
|
||||||
const process1 = await execa("git", ["rev-parse", "source/master"]);
|
const process1 = await execa("git", ["rev-parse", "source/master"]);
|
||||||
const headCommit = process1.stdout;
|
const headCommit = process1.stdout;
|
||||||
|
@ -251,16 +251,16 @@ async function getPulls(github) {
|
||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
const mainlineVariables = {
|
const mainlineVariables = {
|
||||||
owner: 'yuzu-emu',
|
owner: 'suyu-emu',
|
||||||
name: 'yuzu',
|
name: 'suyu',
|
||||||
label: CHANGE_LABEL_MAINLINE,
|
label: CHANGE_LABEL_MAINLINE,
|
||||||
};
|
};
|
||||||
const mainlineResult = await github.graphql(query, mainlineVariables);
|
const mainlineResult = await github.graphql(query, mainlineVariables);
|
||||||
const pulls = mainlineResult.repository.pullRequests.nodes;
|
const pulls = mainlineResult.repository.pullRequests.nodes;
|
||||||
if (BUILD_EA) {
|
if (BUILD_EA) {
|
||||||
const eaVariables = {
|
const eaVariables = {
|
||||||
owner: 'yuzu-emu',
|
owner: 'suyu-emu',
|
||||||
name: 'yuzu',
|
name: 'suyu',
|
||||||
label: CHANGE_LABEL_EA,
|
label: CHANGE_LABEL_EA,
|
||||||
};
|
};
|
||||||
const eaResult = await github.graphql(query, eaVariables);
|
const eaResult = await github.graphql(query, eaVariables);
|
||||||
|
@ -274,7 +274,7 @@ async function getMainlineTag(execa) {
|
||||||
console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`);
|
console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`);
|
||||||
let hasFailed = false;
|
let hasFailed = false;
|
||||||
try {
|
try {
|
||||||
await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-emu/yuzu-android.git"]);
|
await execa("git", ["remote", "add", "mainline", "https://gitlab.com/suyu-emu/suyu-android.git"]);
|
||||||
await execa("git", ["fetch", "mainline", "--tags"]);
|
await execa("git", ["fetch", "mainline", "--tags"]);
|
||||||
await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]);
|
await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]);
|
||||||
await execa("git", ["submodule", "update", "--init", "--recursive"]);
|
await execa("git", ["submodule", "update", "--init", "--recursive"]);
|
||||||
|
@ -289,7 +289,7 @@ async function getMainlineTag(execa) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function mergebot(github, context, execa) {
|
async function mergebot(github, context, execa) {
|
||||||
// Reset our local copy of master to what appears on yuzu-emu/yuzu - master
|
// Reset our local copy of master to what appears on suyu-emu/suyu - master
|
||||||
await resetBranch(execa);
|
await resetBranch(execa);
|
||||||
|
|
||||||
const pulls = await getPulls(github);
|
const pulls = await getPulls(github);
|
||||||
|
@ -300,14 +300,14 @@ async function mergebot(github, context, execa) {
|
||||||
}
|
}
|
||||||
console.info("The following pull requests will be merged:");
|
console.info("The following pull requests will be merged:");
|
||||||
console.table(displayList);
|
console.table(displayList);
|
||||||
await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
|
await fetchPullRequests(pulls, "https://gitlab.com/suyu-emu/suyu", execa);
|
||||||
const mergeResults = await mergePullRequests(pulls, execa);
|
const mergeResults = await mergePullRequests(pulls, execa);
|
||||||
|
|
||||||
if (BUILD_EA) {
|
if (BUILD_EA) {
|
||||||
await tagAndPushEA(github, 'yuzu-emu', `yuzu-android`, execa);
|
await tagAndPushEA(github, 'suyu-emu', `suyu-android`, execa);
|
||||||
} else {
|
} else {
|
||||||
await generateReadme(pulls, context, mergeResults, execa);
|
await generateReadme(pulls, context, mergeResults, execa);
|
||||||
await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
|
await tagAndPush(github, 'suyu-emu', `suyu-android`, execa, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ jobs:
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake"
|
export Qt5_DIR="$(brew --prefix qt@5)/lib/cmake"
|
||||||
cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DYUZU_USE_BUNDLED_VCPKG=OFF -DYUZU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
|
cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSUYU_USE_BUNDLED_VCPKG=OFF -DSUYU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
|
||||||
ninja
|
ninja
|
||||||
build-msvc:
|
build-msvc:
|
||||||
name: 'test build (windows, msvc)'
|
name: 'test build (windows, msvc)'
|
||||||
|
@ -129,7 +129,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
glslangValidator --version
|
glslangValidator --version
|
||||||
mkdir build
|
mkdir build
|
||||||
cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DYUZU_CRASH_DUMPS=ON
|
cmake . -B build -GNinja -DCMAKE_TOOLCHAIN_FILE="CMakeModules/MSVCCache.cmake" -DUSE_CCACHE=ON -DSUYU_USE_BUNDLED_QT=1 -DSUYU_USE_BUNDLED_SDL2=1 -DSUYU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DSUYU_ENABLE_COMPATIBILITY_REPORTING=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DGIT_BRANCH=pr-verify -DSUYU_CRASH_DUMPS=ON
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build build
|
run: cmake --build build
|
||||||
- name: Cache Summary
|
- name: Cache Summary
|
||||||
|
|
18
.reuse/dep5
18
.reuse/dep5
|
@ -12,8 +12,8 @@ Files: dist/english_plurals/*
|
||||||
Copyright: suyu Emulator Project
|
Copyright: suyu Emulator Project
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
|
||||||
Files: dist/qt_themes/default/icons/256x256/yuzu.png
|
Files: dist/qt_themes/default/icons/256x256/suyu.png
|
||||||
dist/yuzu.bmp
|
dist/suyu.bmp
|
||||||
dist/suyu.icns
|
dist/suyu.icns
|
||||||
dist/suyu.ico
|
dist/suyu.ico
|
||||||
dist/suyu.svg
|
dist/suyu.svg
|
||||||
|
@ -108,22 +108,22 @@ Files: externals/FidelityFX-FSR/*
|
||||||
Copyright: 2021 Advanced Micro Devices, Inc.
|
Copyright: 2021 Advanced Micro Devices, Inc.
|
||||||
License: MIT
|
License: MIT
|
||||||
|
|
||||||
Files: src/yuzu/*.ui
|
Files: src/suyu/*.ui
|
||||||
Copyright: 2018-2022 yuzu Emulator Project
|
Copyright: 2018-2022 yuzu Emulator Project
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
|
||||||
Files: src/yuzu/compatdb.ui
|
Files: src/suyu/compatdb.ui
|
||||||
src/yuzu/main.ui
|
src/suyu/main.ui
|
||||||
Copyright: 2014-2017 Citra Emulator Project
|
Copyright: 2014-2017 Citra Emulator Project
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
|
||||||
Files: src/yuzu/loading_screen.ui
|
Files: src/suyu/loading_screen.ui
|
||||||
Copyright: 2019 James Rowe <jroweboy@gmail.com>
|
Copyright: 2019 James Rowe <jroweboy@gmail.com>
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
|
||||||
Files: src/yuzu/applets/aboutdialog.ui
|
Files: src/suyu/applets/aboutdialog.ui
|
||||||
src/yuzu/applets/qt_software_keyboard.ui
|
src/suyu/applets/qt_software_keyboard.ui
|
||||||
src/yuzu/util/overlay_dialog.ui
|
src/suyu/util/overlay_dialog.ui
|
||||||
Copyright: 2020-2021 Its-Rei <kupfel@gmail.com>
|
Copyright: 2020-2021 Its-Rei <kupfel@gmail.com>
|
||||||
2020-2021 yuzu Emulator Project
|
2020-2021 yuzu Emulator Project
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
|
|
134
CMakeLists.txt
134
CMakeLists.txt
|
@ -1,9 +1,9 @@
|
||||||
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.22)
|
cmake_minimum_required(VERSION 3.22)
|
||||||
|
|
||||||
project(yuzu)
|
project(suyu)
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
|
||||||
|
@ -15,9 +15,9 @@ include(CTest)
|
||||||
# Set bundled sdl2/qt as dependent options.
|
# Set bundled sdl2/qt as dependent options.
|
||||||
# OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
|
# OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
|
||||||
option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
|
option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
|
||||||
CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON "ENABLE_SDL2;MSVC" OFF)
|
CMAKE_DEPENDENT_OPTION(SUYU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON "ENABLE_SDL2;MSVC" OFF)
|
||||||
# On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion
|
# On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion
|
||||||
CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ON "ENABLE_SDL2;NOT MSVC" OFF)
|
CMAKE_DEPENDENT_OPTION(SUYU_USE_EXTERNAL_SDL2 "Compile external SDL2" ON "ENABLE_SDL2;NOT MSVC" OFF)
|
||||||
|
|
||||||
cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
|
cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
|
||||||
|
|
||||||
|
@ -28,45 +28,45 @@ option(ENABLE_QT6 "Allow usage of Qt6 to be attempted" OFF)
|
||||||
set(QT6_LOCATION "" CACHE PATH "Additional Location to search for Qt6 libraries like C:/Qt/6.3.1/msvc2019_64/")
|
set(QT6_LOCATION "" CACHE PATH "Additional Location to search for Qt6 libraries like C:/Qt/6.3.1/msvc2019_64/")
|
||||||
|
|
||||||
option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
|
option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
|
||||||
CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
|
CMAKE_DEPENDENT_OPTION(SUYU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
|
||||||
|
|
||||||
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" OFF)
|
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" OFF)
|
||||||
|
|
||||||
option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")
|
option(SUYU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")
|
||||||
|
|
||||||
option(YUZU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON)
|
option(SUYU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON)
|
||||||
|
|
||||||
option(YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES "Use Vulkan-Utility-Libraries from externals" ON)
|
option(SUYU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES "Use Vulkan-Utility-Libraries from externals" ON)
|
||||||
|
|
||||||
option(SUYU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
|
option(SUYU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
|
||||||
|
|
||||||
option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
|
option(SUYU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
|
||||||
|
|
||||||
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
|
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
|
||||||
|
|
||||||
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
|
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
|
||||||
|
|
||||||
option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
|
option(SUYU_TESTS "Compile tests" "${BUILD_TESTING}")
|
||||||
|
|
||||||
option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
|
option(SUYU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
|
||||||
|
|
||||||
option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
|
option(SUYU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
|
||||||
|
|
||||||
CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
|
CMAKE_DEPENDENT_OPTION(SUYU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
|
||||||
|
|
||||||
CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
|
CMAKE_DEPENDENT_OPTION(SUYU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
|
||||||
|
|
||||||
option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}")
|
option(SUYU_USE_BUNDLED_VCPKG "Use vcpkg for suyu dependencies" "${MSVC}")
|
||||||
|
|
||||||
option(YUZU_CHECK_SUBMODULES "Check if submodules are present" ON)
|
option(SUYU_CHECK_SUBMODULES "Check if submodules are present" ON)
|
||||||
|
|
||||||
option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
|
option(SUYU_ENABLE_LTO "Enable link-time optimization" OFF)
|
||||||
|
|
||||||
option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)
|
option(SUYU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)
|
||||||
|
|
||||||
option(SUYU_ENABLE_PORTABLE "Allow suyu to enable portable mode if a user folder is found in the CWD" ON)
|
option(SUYU_ENABLE_PORTABLE "Allow suyu to enable portable mode if a user folder is found in the CWD" ON)
|
||||||
|
|
||||||
CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
|
CMAKE_DEPENDENT_OPTION(SUYU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
|
||||||
|
|
||||||
CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
|
CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ if (ANDROID OR WIN32 OR APPLE)
|
||||||
endif()
|
endif()
|
||||||
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
|
option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
|
||||||
|
|
||||||
if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
|
if (ANDROID AND SUYU_DOWNLOAD_ANDROID_VVL)
|
||||||
set(vvl_version "sdk-1.3.261.1")
|
set(vvl_version "sdk-1.3.261.1")
|
||||||
set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
|
set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
|
||||||
if (NOT EXISTS "${vvl_zip_file}")
|
if (NOT EXISTS "${vvl_zip_file}")
|
||||||
|
@ -104,7 +104,7 @@ if (ANDROID)
|
||||||
set(CMAKE_SKIP_INSTALL_RULES ON)
|
set(CMAKE_SKIP_INSTALL_RULES ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_USE_BUNDLED_VCPKG)
|
if (SUYU_USE_BUNDLED_VCPKG)
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}")
|
set(ENV{ANDROID_NDK_HOME} "${ANDROID_NDK}")
|
||||||
list(APPEND VCPKG_MANIFEST_FEATURES "android")
|
list(APPEND VCPKG_MANIFEST_FEATURES "android")
|
||||||
|
@ -138,8 +138,8 @@ if (YUZU_USE_BUNDLED_VCPKG)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_TESTS)
|
if (SUYU_TESTS)
|
||||||
list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests")
|
list(APPEND VCPKG_MANIFEST_FEATURES "suyu-tests")
|
||||||
endif()
|
endif()
|
||||||
if (ENABLE_WEB_SERVICE)
|
if (ENABLE_WEB_SERVICE)
|
||||||
list(APPEND VCPKG_MANIFEST_FEATURES "web-service")
|
list(APPEND VCPKG_MANIFEST_FEATURES "web-service")
|
||||||
|
@ -155,16 +155,16 @@ elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "")
|
||||||
include("$ENV{VCPKG_TOOLCHAIN_FILE}")
|
include("$ENV{VCPKG_TOOLCHAIN_FILE}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_USE_PRECOMPILED_HEADERS)
|
if (SUYU_USE_PRECOMPILED_HEADERS)
|
||||||
if (MSVC AND CCACHE)
|
if (MSVC AND CCACHE)
|
||||||
# buildcache does not properly cache PCH files, leading to compilation errors.
|
# buildcache does not properly cache PCH files, leading to compilation errors.
|
||||||
# See https://github.com/mbitsnbites/buildcache/discussions/230
|
# See https://github.com/mbitsnbites/buildcache/discussions/230
|
||||||
message(WARNING "buildcache does not properly support Precompiled Headers. Disabling PCH")
|
message(WARNING "buildcache does not properly support Precompiled Headers. Disabling PCH")
|
||||||
set(DYNARMIC_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
|
set(DYNARMIC_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
|
||||||
set(YUZU_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
|
set(SUYU_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
if (YUZU_USE_PRECOMPILED_HEADERS)
|
if (SUYU_USE_PRECOMPILED_HEADERS)
|
||||||
message(STATUS "Using Precompiled Headers.")
|
message(STATUS "Using Precompiled Headers.")
|
||||||
set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
|
set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
|
||||||
endif()
|
endif()
|
||||||
|
@ -199,7 +199,7 @@ function(check_submodules_present)
|
||||||
endforeach()
|
endforeach()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
if(EXISTS ${PROJECT_SOURCE_DIR}/.gitmodules AND YUZU_CHECK_SUBMODULES)
|
if(EXISTS ${PROJECT_SOURCE_DIR}/.gitmodules AND SUYU_CHECK_SUBMODULES)
|
||||||
check_submodules_present()
|
check_submodules_present()
|
||||||
endif()
|
endif()
|
||||||
configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
|
configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
|
||||||
|
@ -211,9 +211,9 @@ if (EXISTS ${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.json
|
||||||
COPYONLY)
|
COPYONLY)
|
||||||
endif()
|
endif()
|
||||||
if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
|
if (ENABLE_COMPATIBILITY_LIST_DOWNLOAD AND NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
|
||||||
message(STATUS "Downloading compatibility list for yuzu...")
|
message(STATUS "Downloading compatibility list for suyu...")
|
||||||
file(DOWNLOAD
|
file(DOWNLOAD
|
||||||
https://api.yuzu-emu.org/gamedb/
|
https://api.suyu.dev/gamedb/
|
||||||
"${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json" SHOW_PROGRESS)
|
"${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json" SHOW_PROGRESS)
|
||||||
endif()
|
endif()
|
||||||
if (NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
|
if (NOT EXISTS ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
|
||||||
|
@ -306,11 +306,11 @@ find_package(VulkanMemoryAllocator CONFIG)
|
||||||
find_package(ZLIB 1.2 REQUIRED)
|
find_package(ZLIB 1.2 REQUIRED)
|
||||||
find_package(zstd 1.5 REQUIRED)
|
find_package(zstd 1.5 REQUIRED)
|
||||||
|
|
||||||
if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
|
if (NOT SUYU_USE_EXTERNAL_VULKAN_HEADERS)
|
||||||
find_package(VulkanHeaders 1.3.274 REQUIRED)
|
find_package(VulkanHeaders 1.3.274 REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
|
if (NOT SUYU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
|
||||||
find_package(VulkanUtilityLibraries REQUIRED)
|
find_package(VulkanUtilityLibraries REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -346,7 +346,7 @@ if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE)
|
||||||
find_package(httplib 0.12 MODULE COMPONENTS OpenSSL)
|
find_package(httplib 0.12 MODULE COMPONENTS OpenSSL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_TESTS)
|
if (SUYU_TESTS)
|
||||||
find_package(Catch2 3.0.1 REQUIRED)
|
find_package(Catch2 3.0.1 REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -368,26 +368,26 @@ if(ENABLE_QT6 AND Qt6_LOCATION)
|
||||||
list(APPEND CMAKE_PREFIX_PATH "${Qt6_LOCATION}")
|
list(APPEND CMAKE_PREFIX_PATH "${Qt6_LOCATION}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
function(set_yuzu_qt_components)
|
function(set_suyu_qt_components)
|
||||||
# Best practice is to ask for all components at once, so they are from the same version
|
# Best practice is to ask for all components at once, so they are from the same version
|
||||||
set(YUZU_QT_COMPONENTS2 Core Widgets Concurrent)
|
set(SUYU_QT_COMPONENTS2 Core Widgets Concurrent)
|
||||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||||
list(APPEND YUZU_QT_COMPONENTS2 DBus)
|
list(APPEND SUYU_QT_COMPONENTS2 DBus)
|
||||||
endif()
|
endif()
|
||||||
if (SUYU_USE_QT_MULTIMEDIA)
|
if (SUYU_USE_QT_MULTIMEDIA)
|
||||||
list(APPEND YUZU_QT_COMPONENTS2 Multimedia)
|
list(APPEND SUYU_QT_COMPONENTS2 Multimedia)
|
||||||
endif()
|
endif()
|
||||||
if (YUZU_USE_QT_WEB_ENGINE)
|
if (SUYU_USE_QT_WEB_ENGINE)
|
||||||
list(APPEND YUZU_QT_COMPONENTS2 WebEngineCore WebEngineWidgets)
|
list(APPEND SUYU_QT_COMPONENTS2 WebEngineCore WebEngineWidgets)
|
||||||
endif()
|
endif()
|
||||||
if (ENABLE_QT_TRANSLATION)
|
if (ENABLE_QT_TRANSLATION)
|
||||||
list(APPEND YUZU_QT_COMPONENTS2 LinguistTools)
|
list(APPEND SUYU_QT_COMPONENTS2 LinguistTools)
|
||||||
endif()
|
endif()
|
||||||
if (USE_DISCORD_PRESENCE)
|
if (USE_DISCORD_PRESENCE)
|
||||||
list(APPEND YUZU_QT_COMPONENTS2 Network)
|
list(APPEND SUYU_QT_COMPONENTS2 Network)
|
||||||
endif()
|
endif()
|
||||||
set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE)
|
set(SUYU_QT_COMPONENTS ${SUYU_QT_COMPONENTS2} PARENT_SCOPE)
|
||||||
endfunction(set_yuzu_qt_components)
|
endfunction(set_suyu_qt_components)
|
||||||
|
|
||||||
# Qt5 requires that we find components, so it doesn't fit our pretty little find package function
|
# Qt5 requires that we find components, so it doesn't fit our pretty little find package function
|
||||||
if(ENABLE_QT)
|
if(ENABLE_QT)
|
||||||
|
@ -396,18 +396,18 @@ if(ENABLE_QT)
|
||||||
set(QT5_VERSION 5.15)
|
set(QT5_VERSION 5.15)
|
||||||
set(QT6_VERSION 6.3.1)
|
set(QT6_VERSION 6.3.1)
|
||||||
|
|
||||||
set_yuzu_qt_components()
|
set_suyu_qt_components()
|
||||||
if (ENABLE_QT6)
|
if (ENABLE_QT6)
|
||||||
find_package(Qt6 ${QT6_VERSION} COMPONENTS ${YUZU_QT_COMPONENTS})
|
find_package(Qt6 ${QT6_VERSION} COMPONENTS ${SUYU_QT_COMPONENTS})
|
||||||
endif()
|
endif()
|
||||||
if (Qt6_FOUND)
|
if (Qt6_FOUND)
|
||||||
message(STATUS "yuzu/CMakeLists.txt: Qt6Widgets_VERSION ${Qt6Widgets_VERSION}, setting QT_VERSION")
|
message(STATUS "suyu/CMakeLists.txt: Qt6Widgets_VERSION ${Qt6Widgets_VERSION}, setting QT_VERSION")
|
||||||
set(QT_VERSION ${Qt6Widgets_VERSION})
|
set(QT_VERSION ${Qt6Widgets_VERSION})
|
||||||
set(QT_MAJOR_VERSION 6)
|
set(QT_MAJOR_VERSION 6)
|
||||||
# Qt6 sets cxx_std_17 and we need to undo that
|
# Qt6 sets cxx_std_17 and we need to undo that
|
||||||
set_target_properties(Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "")
|
set_target_properties(Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "")
|
||||||
else()
|
else()
|
||||||
message(STATUS "yuzu/CMakeLists.txt: Qt6 not found/not selected, trying for Qt5")
|
message(STATUS "suyu/CMakeLists.txt: Qt6 not found/not selected, trying for Qt5")
|
||||||
# When Qt6 partially found, need this set to use Qt5 when not specifying version
|
# When Qt6 partially found, need this set to use Qt5 when not specifying version
|
||||||
set(QT_DEFAULT_MAJOR_VERSION 5)
|
set(QT_DEFAULT_MAJOR_VERSION 5)
|
||||||
set(QT_MAJOR_VERSION 5)
|
set(QT_MAJOR_VERSION 5)
|
||||||
|
@ -415,10 +415,10 @@ if(ENABLE_QT)
|
||||||
set(SUYU_USE_QT_MULTIMEDIA ON)
|
set(SUYU_USE_QT_MULTIMEDIA ON)
|
||||||
# Check for system Qt on Linux, fallback to bundled Qt
|
# Check for system Qt on Linux, fallback to bundled Qt
|
||||||
if (UNIX AND NOT APPLE)
|
if (UNIX AND NOT APPLE)
|
||||||
if (NOT YUZU_USE_BUNDLED_QT)
|
if (NOT SUYU_USE_BUNDLED_QT)
|
||||||
find_package(Qt5 ${QT5_VERSION} COMPONENTS Widgets DBus Multimedia)
|
find_package(Qt5 ${QT5_VERSION} COMPONENTS Widgets DBus Multimedia)
|
||||||
endif()
|
endif()
|
||||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT))
|
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND (NOT Qt5_FOUND OR SUYU_USE_BUNDLED_QT))
|
||||||
# Check for dependencies, then enable bundled Qt download
|
# Check for dependencies, then enable bundled Qt download
|
||||||
|
|
||||||
# Check that the system GLIBCXX version is compatible
|
# Check that the system GLIBCXX version is compatible
|
||||||
|
@ -492,23 +492,23 @@ if(ENABLE_QT)
|
||||||
message(FATAL_ERROR "Bundled Qt package missing required dependencies: ${UNRESOLVED_QT_DEPS}")
|
message(FATAL_ERROR "Bundled Qt package missing required dependencies: ${UNRESOLVED_QT_DEPS}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(YUZU_USE_BUNDLED_QT ON CACHE BOOL "Download bundled Qt" FORCE)
|
set(SUYU_USE_BUNDLED_QT ON CACHE BOOL "Download bundled Qt" FORCE)
|
||||||
endif()
|
endif()
|
||||||
if (YUZU_USE_BUNDLED_QT)
|
if (SUYU_USE_BUNDLED_QT)
|
||||||
# Binary package currently does not support Qt webengine, so make sure it's disabled
|
# Binary package currently does not support Qt webengine, so make sure it's disabled
|
||||||
set(YUZU_USE_QT_WEB_ENGINE OFF CACHE BOOL "Use Qt Webengine" FORCE)
|
set(SUYU_USE_QT_WEB_ENGINE OFF CACHE BOOL "Use Qt Webengine" FORCE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(YUZU_QT_NO_CMAKE_SYSTEM_PATH)
|
set(SUYU_QT_NO_CMAKE_SYSTEM_PATH)
|
||||||
|
|
||||||
if(YUZU_USE_BUNDLED_QT)
|
if(SUYU_USE_BUNDLED_QT)
|
||||||
if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
|
if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
|
||||||
set(QT_BUILD qt-5.15.2-msvc2019_64)
|
set(QT_BUILD qt-5.15.2-msvc2019_64)
|
||||||
elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64)
|
elseif ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND NOT MINGW AND ARCHITECTURE_x86_64)
|
||||||
set(QT_BUILD qt5_5_15_2)
|
set(QT_BUILD qt5_5_15_2)
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
|
message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable SUYU_USE_BUNDLED_QT and provide your own.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (DEFINED QT_BUILD)
|
if (DEFINED QT_BUILD)
|
||||||
|
@ -517,25 +517,25 @@ if(ENABLE_QT)
|
||||||
|
|
||||||
set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
|
set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
|
||||||
|
|
||||||
set(YUZU_QT_NO_CMAKE_SYSTEM_PATH "NO_CMAKE_SYSTEM_PATH")
|
set(SUYU_QT_NO_CMAKE_SYSTEM_PATH "NO_CMAKE_SYSTEM_PATH")
|
||||||
# Binary package for Qt5 has Qt Multimedia
|
# Binary package for Qt5 has Qt Multimedia
|
||||||
set(SUYU_USE_QT_MULTIMEDIA ON CACHE BOOL "Use Qt Multimedia" FORCE)
|
set(SUYU_USE_QT_MULTIMEDIA ON CACHE BOOL "Use Qt Multimedia" FORCE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_yuzu_qt_components()
|
set_suyu_qt_components()
|
||||||
find_package(Qt5 ${QT5_VERSION} COMPONENTS ${YUZU_QT_COMPONENTS} ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH})
|
find_package(Qt5 ${QT5_VERSION} COMPONENTS ${SUYU_QT_COMPONENTS} ${QT_PREFIX_HINT} ${SUYU_QT_NO_CMAKE_SYSTEM_PATH})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the yuzu_find_package
|
# find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the suyu_find_package
|
||||||
if (ENABLE_SDL2)
|
if (ENABLE_SDL2)
|
||||||
if (YUZU_USE_BUNDLED_SDL2)
|
if (SUYU_USE_BUNDLED_SDL2)
|
||||||
# Detect toolchain and platform
|
# Detect toolchain and platform
|
||||||
if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
|
if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
|
||||||
set(SDL2_VER "SDL2-2.28.2")
|
set(SDL2_VER "SDL2-2.28.2")
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
|
message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable SUYU_USE_BUNDLED_SDL2 and provide your own.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (DEFINED SDL2_VER)
|
if (DEFINED SDL2_VER)
|
||||||
|
@ -550,7 +550,7 @@ if (ENABLE_SDL2)
|
||||||
add_library(SDL2::SDL2 INTERFACE IMPORTED)
|
add_library(SDL2::SDL2 INTERFACE IMPORTED)
|
||||||
target_link_libraries(SDL2::SDL2 INTERFACE "${SDL2_LIBRARY}")
|
target_link_libraries(SDL2::SDL2 INTERFACE "${SDL2_LIBRARY}")
|
||||||
target_include_directories(SDL2::SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
|
target_include_directories(SDL2::SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
|
||||||
elseif (YUZU_USE_EXTERNAL_SDL2)
|
elseif (SUYU_USE_EXTERNAL_SDL2)
|
||||||
message(STATUS "Using SDL2 from externals.")
|
message(STATUS "Using SDL2 from externals.")
|
||||||
else()
|
else()
|
||||||
find_package(SDL2 2.26.4 REQUIRED)
|
find_package(SDL2 2.26.4 REQUIRED)
|
||||||
|
@ -568,12 +568,12 @@ if (UNIX AND NOT APPLE AND NOT ANDROID)
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
pkg_check_modules(LIBVA libva)
|
pkg_check_modules(LIBVA libva)
|
||||||
endif()
|
endif()
|
||||||
if (NOT YUZU_USE_BUNDLED_FFMPEG)
|
if (NOT SUYU_USE_BUNDLED_FFMPEG)
|
||||||
# Use system installed FFmpeg
|
# Use system installed FFmpeg
|
||||||
find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
|
find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32 AND YUZU_CRASH_DUMPS)
|
if (WIN32 AND SUYU_CRASH_DUMPS)
|
||||||
set(BREAKPAD_VER "breakpad-c89f9dd")
|
set(BREAKPAD_VER "breakpad-c89f9dd")
|
||||||
download_bundled_external("breakpad/" ${BREAKPAD_VER} BREAKPAD_PREFIX)
|
download_bundled_external("breakpad/" ${BREAKPAD_VER} BREAKPAD_PREFIX)
|
||||||
|
|
||||||
|
@ -688,7 +688,7 @@ if (MSVC AND CMAKE_GENERATOR STREQUAL "Ninja")
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
if (SUYU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
# We will assume that if the compiler is GCC, it will attempt to use ld.bfd by default.
|
# We will assume that if the compiler is GCC, it will attempt to use ld.bfd by default.
|
||||||
# Try to pick a faster linker.
|
# Try to pick a faster linker.
|
||||||
find_program(LLD lld)
|
find_program(LLD lld)
|
||||||
|
@ -706,11 +706,11 @@ endif()
|
||||||
add_subdirectory(externals)
|
add_subdirectory(externals)
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|
||||||
# Set yuzu project or yuzu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
|
# Set suyu project or suyu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
|
||||||
if(ENABLE_QT)
|
if(ENABLE_QT)
|
||||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT yuzu)
|
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT suyu)
|
||||||
else()
|
else()
|
||||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT yuzu-cmd)
|
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT suyu-cmd)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# SPDX-FileCopyrightText: 2020 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2020 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
function(copy_yuzu_FFmpeg_deps target_dir)
|
function(copy_suyu_FFmpeg_deps target_dir)
|
||||||
include(WindowsCopyFiles)
|
include(WindowsCopyFiles)
|
||||||
set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
|
set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
|
||||||
file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
|
file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
|
||||||
string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS)
|
string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS)
|
||||||
windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
|
windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
|
||||||
endfunction(copy_yuzu_FFmpeg_deps)
|
endfunction(copy_suyu_FFmpeg_deps)
|
|
@ -1,7 +1,7 @@
|
||||||
# SPDX-FileCopyrightText: 2016 Citra Emulator Project & 2024 suyu Emulator Project
|
# SPDX-FileCopyrightText: 2016 Citra Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
function(copy_yuzu_Qt5_deps target_dir)
|
function(copy_suyu_Qt5_deps target_dir)
|
||||||
include(WindowsCopyFiles)
|
include(WindowsCopyFiles)
|
||||||
set(Qt5_BASE_PATH "${Qt5_DIR}/../../..")
|
set(Qt5_BASE_PATH "${Qt5_DIR}/../../..")
|
||||||
if (NOT EXISTS "${Qt5_BASE_PATH}/bin")
|
if (NOT EXISTS "${Qt5_BASE_PATH}/bin")
|
||||||
|
@ -38,7 +38,7 @@ function(copy_yuzu_Qt5_deps target_dir)
|
||||||
Qt5Multimedia$<$<CONFIG:Debug>:d>.*
|
Qt5Multimedia$<$<CONFIG:Debug>:d>.*
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
if (YUZU_USE_QT_WEB_ENGINE)
|
if (SUYU_USE_QT_WEB_ENGINE)
|
||||||
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
|
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
|
||||||
Qt5Network$<$<CONFIG:Debug>:d>.*
|
Qt5Network$<$<CONFIG:Debug>:d>.*
|
||||||
Qt5Positioning$<$<CONFIG:Debug>:d>.*
|
Qt5Positioning$<$<CONFIG:Debug>:d>.*
|
||||||
|
@ -61,13 +61,13 @@ function(copy_yuzu_Qt5_deps target_dir)
|
||||||
qtwebengine_resources_200p.pak
|
qtwebengine_resources_200p.pak
|
||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
|
windows_copy_files(suyu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
|
||||||
windows_copy_files(yuzu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*)
|
windows_copy_files(suyu ${Qt5_STYLES_DIR} ${STYLES} qwindowsvistastyle$<$<CONFIG:Debug>:d>.*)
|
||||||
windows_copy_files(yuzu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS}
|
windows_copy_files(suyu ${Qt5_IMAGEFORMATS_DIR} ${IMAGEFORMATS}
|
||||||
qjpeg$<$<CONFIG:Debug>:d>.*
|
qjpeg$<$<CONFIG:Debug>:d>.*
|
||||||
qgif$<$<CONFIG:Debug>:d>.*
|
qgif$<$<CONFIG:Debug>:d>.*
|
||||||
)
|
)
|
||||||
windows_copy_files(yuzu ${Qt5_MEDIASERVICE_DIR} ${MEDIASERVICE}
|
windows_copy_files(suyu ${Qt5_MEDIASERVICE_DIR} ${MEDIASERVICE}
|
||||||
dsengine$<$<CONFIG:Debug>:d>.*
|
dsengine$<$<CONFIG:Debug>:d>.*
|
||||||
wmfengine$<$<CONFIG:Debug>:d>.*
|
wmfengine$<$<CONFIG:Debug>:d>.*
|
||||||
)
|
)
|
||||||
|
@ -123,7 +123,7 @@ function(copy_yuzu_Qt5_deps target_dir)
|
||||||
endif()
|
endif()
|
||||||
# Create an empty qt.conf file. Qt will detect that this file exists, and use the folder that its in as the root folder.
|
# Create an empty qt.conf file. Qt will detect that this file exists, and use the folder that its in as the root folder.
|
||||||
# This way it'll look for plugins in the root/plugins/ folder
|
# This way it'll look for plugins in the root/plugins/ folder
|
||||||
add_custom_command(TARGET yuzu POST_BUILD
|
add_custom_command(TARGET suyu POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E touch ${DLL_DEST}qt.conf
|
COMMAND ${CMAKE_COMMAND} -E touch ${DLL_DEST}qt.conf
|
||||||
)
|
)
|
||||||
endfunction(copy_yuzu_Qt5_deps)
|
endfunction(copy_suyu_Qt5_deps)
|
|
@ -1,8 +1,8 @@
|
||||||
# SPDX-FileCopyrightText: 2016 Citra Emulator Project
|
# SPDX-FileCopyrightText: 2016 Citra Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
function(copy_yuzu_SDL_deps target_dir)
|
function(copy_suyu_SDL_deps target_dir)
|
||||||
include(WindowsCopyFiles)
|
include(WindowsCopyFiles)
|
||||||
set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
|
set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
|
||||||
windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
|
windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
|
||||||
endfunction(copy_yuzu_SDL_deps)
|
endfunction(copy_suyu_SDL_deps)
|
|
@ -19,7 +19,7 @@ if (LLVM_FOUND AND LLVM_Demangle_FOUND AND NOT TARGET LLVM::Demangle)
|
||||||
target_include_directories(LLVM::Demangle INTERFACE ${LLVM_INCLUDE_DIRS})
|
target_include_directories(LLVM::Demangle INTERFACE ${LLVM_INCLUDE_DIRS})
|
||||||
# prefer shared LLVM: https://github.com/llvm/llvm-project/issues/34593
|
# prefer shared LLVM: https://github.com/llvm/llvm-project/issues/34593
|
||||||
# but use ugly hack because llvm_config doesn't support interface library
|
# but use ugly hack because llvm_config doesn't support interface library
|
||||||
add_library(_dummy_lib SHARED EXCLUDE_FROM_ALL src/yuzu/main.cpp)
|
add_library(_dummy_lib SHARED EXCLUDE_FROM_ALL src/suyu/main.cpp)
|
||||||
llvm_config(_dummy_lib USE_SHARED demangle)
|
llvm_config(_dummy_lib USE_SHARED demangle)
|
||||||
get_target_property(LLVM_LIBRARIES _dummy_lib LINK_LIBRARIES)
|
get_target_property(LLVM_LIBRARIES _dummy_lib LINK_LIBRARIES)
|
||||||
target_link_libraries(LLVM::Demangle INTERFACE ${LLVM_LIBRARIES})
|
target_link_libraries(LLVM::Demangle INTERFACE ${LLVM_LIBRARIES})
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
# Gets a UTC timestamp and sets the provided variable to it
|
# Gets a UTC timestamp and sets the provided variable to it
|
||||||
|
@ -27,7 +27,7 @@ set(BUILD_VERSION "0")
|
||||||
set(BUILD_ID ${DISPLAY_VERSION})
|
set(BUILD_ID ${DISPLAY_VERSION})
|
||||||
if (BUILD_REPOSITORY)
|
if (BUILD_REPOSITORY)
|
||||||
# regex capture the string nightly or canary into CMAKE_MATCH_1
|
# regex capture the string nightly or canary into CMAKE_MATCH_1
|
||||||
string(REGEX MATCH "yuzu-emu/yuzu-?(.*)" OUTVAR ${BUILD_REPOSITORY})
|
string(REGEX MATCH "suyu-emu/suyu-?(.*)" OUTVAR ${BUILD_REPOSITORY})
|
||||||
if ("${CMAKE_MATCH_COUNT}" GREATER 0)
|
if ("${CMAKE_MATCH_COUNT}" GREATER 0)
|
||||||
# capitalize the first letter of each word in the repo name.
|
# capitalize the first letter of each word in the repo name.
|
||||||
string(REPLACE "-" ";" REPO_NAME_LIST ${CMAKE_MATCH_1})
|
string(REPLACE "-" ";" REPO_NAME_LIST ${CMAKE_MATCH_1})
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<!--
|
<!--
|
||||||
SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later
|
SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
-->
|
-->
|
||||||
|
|
||||||
Please check out the
|
Please check out the
|
||||||
|
|
||||||
* [Conributors's guide](https://gitlab.com/suyu2/suyu/-/wikis/Contributing).
|
* [Conributors's guide](https://gitlab.com/suyu-emu/suyu/-/wikis/Contributing).
|
||||||
* [Merge request guidelines](https://gitlab.com/suyu-emu/suyu/-/wikis/Merge-requests)
|
* [Merge request guidelines](https://gitlab.com/suyu-emu/suyu/-/wikis/Merge-requests)
|
||||||
|
|
2
Doxyfile
2
Doxyfile
|
@ -35,7 +35,7 @@ DOXYFILE_ENCODING = UTF-8
|
||||||
# title of most generated pages and in a few other places.
|
# title of most generated pages and in a few other places.
|
||||||
# The default value is: My Project.
|
# The default value is: My Project.
|
||||||
|
|
||||||
PROJECT_NAME = yuzu
|
PROJECT_NAME = suyu
|
||||||
|
|
||||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
|
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
|
||||||
# could be handy for archiving the generated documentation or if some version
|
# could be handy for archiving the generated documentation or if some version
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
# Allow systemd-logind to manage user access to hidraw with this file
|
# Allow systemd-logind to manage user access to hidraw with this file
|
||||||
# On most systems, this file should be installed to /etc/udev/rules.d/72-yuzu-input.rules
|
# On most systems, this file should be installed to /etc/udev/rules.d/72-suyu-input.rules
|
||||||
# Consult your distro if this is not the case
|
# Consult your distro if this is not the case
|
||||||
|
|
||||||
# Switch Pro Controller (USB/Bluetooth)
|
# Switch Pro Controller (USB/Bluetooth)
|
|
@ -10,7 +10,7 @@ Qt has "Translation Rules for Plurals", small example
|
||||||
// i = 2:
|
// i = 2:
|
||||||
Building: 2 shaders
|
Building: 2 shaders
|
||||||
|
|
||||||
For yuzu the source language used is English, for all other languages handling of plurals is handled by Qt and the translation collaboration site. Handling plurals in the source language (English) requires special consideration.
|
For suyu the source language used is English, for all other languages handling of plurals is handled by Qt and the translation collaboration site. Handling plurals in the source language (English) requires special consideration.
|
||||||
|
|
||||||
With CMake flag GENERATE_QT_TRANSLATION a generated_en.ts file is created from the source. It ignored by git (`.gitignore` in the project root). It is placed in this directory so that the relative refrences with the source code is correct.
|
With CMake flag GENERATE_QT_TRANSLATION a generated_en.ts file is created from the source. It ignored by git (`.gitignore` in the project root). It is placed in this directory so that the relative refrences with the source code is correct.
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<context>
|
<context>
|
||||||
<name>GMainWindow</name>
|
<name>GMainWindow</name>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<location filename="../../src/yuzu/main.cpp" line="2322"/>
|
<location filename="../../src/suyu/main.cpp" line="2322"/>
|
||||||
<source>%n file(s) remaining</source>
|
<source>%n file(s) remaining</source>
|
||||||
<translation>
|
<translation>
|
||||||
<numerusform>%n file remaining</numerusform>
|
<numerusform>%n file remaining</numerusform>
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<location filename="../../src/yuzu/main.cpp" line="2377"/>
|
<location filename="../../src/suyu/main.cpp" line="2377"/>
|
||||||
<source>%n file(s) were newly installed
|
<source>%n file(s) were newly installed
|
||||||
</source>
|
</source>
|
||||||
<translation>
|
<translation>
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<location filename="../../src/yuzu/main.cpp" line="2380"/>
|
<location filename="../../src/suyu/main.cpp" line="2380"/>
|
||||||
<source>%n file(s) were overwritten
|
<source>%n file(s) were overwritten
|
||||||
</source>
|
</source>
|
||||||
<translation>
|
<translation>
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<location filename="../../src/yuzu/main.cpp" line="2382"/>
|
<location filename="../../src/suyu/main.cpp" line="2382"/>
|
||||||
<source>%n file(s) failed to install
|
<source>%n file(s) failed to install
|
||||||
</source>
|
</source>
|
||||||
<translation>
|
<translation>
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<location filename="../../src/yuzu/main.cpp" line="3264"/>
|
<location filename="../../src/suyu/main.cpp" line="3264"/>
|
||||||
<source>Building: %n shader(s)</source>
|
<source>Building: %n shader(s)</source>
|
||||||
<translation>
|
<translation>
|
||||||
<numerusform>Building: %n shader</numerusform>
|
<numerusform>Building: %n shader</numerusform>
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
<context>
|
<context>
|
||||||
<name>GameListSearchField</name>
|
<name>GameListSearchField</name>
|
||||||
<message numerus="yes">
|
<message numerus="yes">
|
||||||
<location filename="../../src/yuzu/game_list.cpp" line="87"/>
|
<location filename="../../src/suyu/game_list.cpp" line="87"/>
|
||||||
<source>%1 of %n result(s)</source>
|
<source>%1 of %n result(s)</source>
|
||||||
<translation>
|
<translation>
|
||||||
<numerusform>%1 of %n result</numerusform>
|
<numerusform>%1 of %n result</numerusform>
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
[main]
|
[main]
|
||||||
host = https://www.transifex.com
|
host = https://www.transifex.com
|
||||||
|
|
||||||
[o:yuzu-emulator:p:yuzu:r:emulator]
|
[o:suyu-emulator:p:suyu:r:emulator]
|
||||||
file_filter = <lang>.ts
|
file_filter = <lang>.ts
|
||||||
source_file = en.ts
|
source_file = en.ts
|
||||||
source_lang = en
|
source_lang = en
|
||||||
type = QT
|
type = QT
|
||||||
|
|
||||||
[o:yuzu-emulator:p:yuzu:r:yuzu-android]
|
[o:suyu-emulator:p:suyu:r:suyu-android]
|
||||||
file_filter = ../../src/android/app/src/main/res/values-<lang>/strings.xml
|
file_filter = ../../src/android/app/src/main/res/values-<lang>/strings.xml
|
||||||
source_file = ../../src/android/app/src/main/res/values/strings.xml
|
source_file = ../../src/android/app/src/main/res/values/strings.xml
|
||||||
type = ANDROID
|
type = ANDROID
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
This directory stores translation patches (TS files) for yuzu Qt frontend. This directory is linked with [yuzu project on transifex](https://www.transifex.com/yuzu-emulator/yuzu), so you can update the translation by executing `tx pull -t -a`. If you want to contribute to the translation, please go the transifex link and submit your translation there. This directory on the main repo will be synchronized with transifex periodically.
|
This directory stores translation patches (TS files) for suyu Qt frontend. This directory is linked with [suyu project on transifex](https://www.transifex.com/suyu-emulator/suyu), so you can update the translation by executing `tx pull -t -a`. If you want to contribute to the translation, please go the transifex link and submit your translation there. This directory on the main repo will be synchronized with transifex periodically.
|
||||||
|
|
||||||
Do not directly open PRs on github to modify the translation.
|
Do not directly open PRs on github to modify the translation.
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,5 +1,5 @@
|
||||||
<!--
|
<!--
|
||||||
SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later
|
SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
<file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
|
<file alias="48x48/sd_card.png">icons/48x48/sd_card.png</file>
|
||||||
<file alias="48x48/star.png">icons/48x48/star.png</file>
|
<file alias="48x48/star.png">icons/48x48/star.png</file>
|
||||||
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
|
<file alias="256x256/plus_folder.png">icons/256x256/plus_folder.png</file>
|
||||||
<file alias="256x256/yuzu.png">icons/256x256/yuzu.png</file>
|
<file alias="256x256/suyu.png">icons/256x256/suyu.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="default">
|
<qresource prefix="default">
|
||||||
<file>style.qss</file>
|
<file>style.qss</file>
|
||||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
@ -1,55 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
|
|
||||||
<svg
|
|
||||||
width="512.0px"
|
|
||||||
height="512.0px"
|
|
||||||
viewBox="0 0 512.0 512.0"
|
|
||||||
version="1.1"
|
|
||||||
id="SVGRoot"
|
|
||||||
sodipodi:docname="yuzu.svg"
|
|
||||||
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg">
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="namedview532"
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
bordercolor="#000000"
|
|
||||||
borderopacity="0.25"
|
|
||||||
inkscape:showpageshadow="2"
|
|
||||||
inkscape:pageopacity="0.0"
|
|
||||||
inkscape:pagecheckerboard="0"
|
|
||||||
inkscape:deskcolor="#d1d1d1"
|
|
||||||
inkscape:document-units="px"
|
|
||||||
showgrid="true"
|
|
||||||
inkscape:zoom="4.7521782"
|
|
||||||
inkscape:cx="300.91464"
|
|
||||||
inkscape:cy="437.37838"
|
|
||||||
inkscape:window-width="2048"
|
|
||||||
inkscape:window-height="1080"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="0"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:current-layer="layer1">
|
|
||||||
<inkscape:grid
|
|
||||||
type="xygrid"
|
|
||||||
id="grid538" />
|
|
||||||
</sodipodi:namedview>
|
|
||||||
<defs
|
|
||||||
id="defs527" />
|
|
||||||
<g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1">
|
|
||||||
<path
|
|
||||||
d="m 394.62535,471.3827 c 12.708,-22.807 19.949,-49.07 19.949,-77.014 0,-87.537 -71.054,-158.582 -158.591,-158.582 -65.023,0 -117.8,-52.777 -117.8,-117.806 0,-65.029789 52.777,-117.8059899 117.8,-117.8059899 141.321,0 256.008,114.6879899 256.008,255.9999899 0,90.235 -46.773,169.613 -117.366,215.208 z M 255.98335,52.936011 c -11.96,0 -21.676,9.7148 -21.676,21.6816 0,11.9655 9.716,21.681597 21.676,21.681597 11.977,0 21.681,-9.716097 21.681,-21.681597 0,-11.9668 -9.704,-21.6816 -21.681,-21.6816 z m 43.363,43.363197 c -11.964,0 -21.682,9.714492 -21.682,21.681492 0,11.966 9.718,21.682 21.682,21.682 11.977,0 21.681,-9.716 21.681,-21.682 0,-11.967 -9.704,-21.681492 -21.681,-21.681492 z m -86.72,0 c -11.966,0 -21.68,9.714492 -21.68,21.681492 0,11.966 9.714,21.682 21.68,21.682 11.966,0 21.681,-9.716 21.681,-21.682 0,-11.967 -9.715,-21.681492 -21.681,-21.681492 z m 43.357,43.363492 c -11.96,0 -21.676,9.715 -21.676,21.68 0,11.967 9.716,21.682 21.676,21.682 11.977,0 21.681,-9.715 21.681,-21.682 0,-11.965 -9.704,-21.68 -21.681,-21.68 z"
|
|
||||||
fill="#ff3554"
|
|
||||||
id="path60" />
|
|
||||||
<path
|
|
||||||
d="m 117.35235,40.966411 c -12.704,22.8077 -19.943696,49.070597 -19.943696,77.014289 0,87.537 71.043696,158.582 158.574696,158.582 65.03,0 117.813,52.777 117.813,117.806 0,65.028 -52.783,117.806 -117.813,117.806 -141.305,0 -255.9919924,-114.688 -255.9919924,-256 0,-90.234 46.7638004,-169.614589 117.3609924,-215.208289 z m 138.631,288.357289 c -11.96,0 -21.676,9.716 -21.676,21.682 0,11.967 9.716,21.681 21.676,21.681 11.977,0 21.681,-9.714 21.681,-21.681 0,-11.966 -9.704,-21.682 -21.681,-21.682 z m 43.363,43.363 c -11.964,0 -21.682,9.715 -21.682,21.682 0,11.967 9.718,21.682 21.682,21.682 11.977,0 21.681,-9.715 21.681,-21.682 0,-11.967 -9.704,-21.682 -21.681,-21.682 z m -43.363,43.364 c -11.96,0 -21.676,9.714 -21.676,21.681 0,11.966 9.716,21.682 21.676,21.682 11.977,0 21.681,-9.716 21.681,-21.682 0,-11.967 -9.704,-21.681 -21.681,-21.681 z m -43.358,-43.364 c -11.965,0 -21.68,9.715 -21.68,21.682 0,11.967 9.715,21.682 21.68,21.682 11.967,0 21.682,-9.715 21.682,-21.682 0,-11.967 -9.715,-21.682 -21.682,-21.682 z"
|
|
||||||
fill="#3a99ff"
|
|
||||||
id="path62" />
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 3.4 KiB |
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-FileCopyrightText: 2016 Citra Emulator Project
|
# SPDX-FileCopyrightText: 2016 Citra Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
# Dynarmic has cmake_minimum_required(3.12) and we may want to override
|
# Dynarmic has cmake_minimum_required(3.12) and we may want to override
|
||||||
|
@ -63,11 +63,11 @@ if (ENABLE_LIBUSB AND NOT TARGET libusb::usb)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# SDL2
|
# SDL2
|
||||||
if (YUZU_USE_EXTERNAL_SDL2)
|
if (SUYU_USE_EXTERNAL_SDL2)
|
||||||
if (NOT WIN32)
|
if (NOT WIN32)
|
||||||
# Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
|
# Suyu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
|
||||||
# Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
|
# Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
|
||||||
# Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
|
# Suyu-cmd also needs: Video (depends on Loadso/Dlopen)
|
||||||
# CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
|
# CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
|
||||||
set(SDL_UNUSED_SUBSYSTEMS
|
set(SDL_UNUSED_SUBSYSTEMS
|
||||||
File Filesystem
|
File Filesystem
|
||||||
|
@ -142,7 +142,7 @@ if (NOT TARGET Opus::opus)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# FFMpeg
|
# FFMpeg
|
||||||
if (YUZU_USE_BUNDLED_FFMPEG)
|
if (SUYU_USE_BUNDLED_FFMPEG)
|
||||||
add_subdirectory(ffmpeg)
|
add_subdirectory(ffmpeg)
|
||||||
set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
|
set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
|
||||||
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
|
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE)
|
||||||
|
@ -151,12 +151,12 @@ if (YUZU_USE_BUNDLED_FFMPEG)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Vulkan-Headers
|
# Vulkan-Headers
|
||||||
if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
|
if (SUYU_USE_EXTERNAL_VULKAN_HEADERS)
|
||||||
add_subdirectory(Vulkan-Headers)
|
add_subdirectory(Vulkan-Headers)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Vulkan-Utility-Libraries
|
# Vulkan-Utility-Libraries
|
||||||
if (YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
|
if (SUYU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
|
||||||
add_subdirectory(Vulkan-Utility-Libraries)
|
add_subdirectory(Vulkan-Utility-Libraries)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -210,7 +210,7 @@ endif()
|
||||||
|
|
||||||
# Breakpad
|
# Breakpad
|
||||||
# https://github.com/microsoft/vcpkg/blob/master/ports/breakpad/CMakeLists.txt
|
# https://github.com/microsoft/vcpkg/blob/master/ports/breakpad/CMakeLists.txt
|
||||||
if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
|
if (SUYU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
|
||||||
set(BREAKPAD_WIN32_DEFINES
|
set(BREAKPAD_WIN32_DEFINES
|
||||||
NOMINMAX
|
NOMINMAX
|
||||||
UNICODE
|
UNICODE
|
||||||
|
|
|
@ -143,7 +143,7 @@ if (NOT WIN32 AND NOT ANDROID)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# `configure` parameters builds only exactly what yuzu needs from FFmpeg
|
# `configure` parameters builds only exactly what suyu needs from FFmpeg
|
||||||
# `--disable-vdpau` is needed to avoid linking issues
|
# `--disable-vdpau` is needed to avoid linking issues
|
||||||
set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER} ${CMAKE_C_COMPILER})
|
set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER} ${CMAKE_C_COMPILER})
|
||||||
set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER})
|
set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER})
|
||||||
|
@ -222,7 +222,7 @@ if (NOT WIN32 AND NOT ANDROID)
|
||||||
message(FATAL_ERROR "FFmpeg not found")
|
message(FATAL_ERROR "FFmpeg not found")
|
||||||
endif()
|
endif()
|
||||||
elseif(ANDROID)
|
elseif(ANDROID)
|
||||||
# Use yuzu FFmpeg binaries
|
# Use suyu FFmpeg binaries
|
||||||
if (ARCHITECTURE_arm64)
|
if (ARCHITECTURE_arm64)
|
||||||
set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-aarch64")
|
set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-aarch64")
|
||||||
elseif (ARCHITECTURE_x86_64)
|
elseif (ARCHITECTURE_x86_64)
|
||||||
|
@ -253,7 +253,7 @@ elseif(ANDROID)
|
||||||
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
|
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
|
||||||
set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
|
set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
# Use yuzu FFmpeg binaries
|
# Use suyu FFmpeg binaries
|
||||||
set(FFmpeg_EXT_NAME "ffmpeg-6.0")
|
set(FFmpeg_EXT_NAME "ffmpeg-6.0")
|
||||||
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
|
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
|
||||||
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
|
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
|
||||||
|
|
|
@ -32,7 +32,7 @@ set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")
|
||||||
|
|
||||||
set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
|
set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
|
||||||
|
|
||||||
if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ROMFS_DIR})
|
if ((NOT CAN_BUILD_NX_TZDB OR SUYU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ROMFS_DIR})
|
||||||
set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
|
set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
|
||||||
|
|
||||||
message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
|
message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
|
||||||
|
@ -48,7 +48,7 @@ if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_
|
||||||
${NX_TZDB_ARCHIVE}
|
${NX_TZDB_ARCHIVE}
|
||||||
DESTINATION
|
DESTINATION
|
||||||
${NX_TZDB_ROMFS_DIR})
|
${NX_TZDB_ROMFS_DIR})
|
||||||
elseif (CAN_BUILD_NX_TZDB AND NOT YUZU_DOWNLOAD_TIME_ZONE_DATA)
|
elseif (CAN_BUILD_NX_TZDB AND NOT SUYU_DOWNLOAD_TIME_ZONE_DATA)
|
||||||
add_subdirectory(tzdb_to_nx)
|
add_subdirectory(tzdb_to_nx)
|
||||||
add_dependencies(nx_tzdb x80e)
|
add_dependencies(nx_tzdb x80e)
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# SPDX-FileCopyrightText: 2015 Citra Emulator Project
|
# SPDX-FileCopyrightText: 2015 Citra Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
# Enforce yuzu's whitespace policy
|
# Enforce suyu's whitespace policy
|
||||||
git config --local core.whitespace tab-in-indent,trailing-space
|
git config --local core.whitespace tab-in-indent,trailing-space
|
||||||
|
|
||||||
paths_to_check="src/ CMakeLists.txt"
|
paths_to_check="src/ CMakeLists.txt"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
# Enable modules to include each other's files
|
# Enable modules to include each other's files
|
||||||
|
@ -88,7 +88,7 @@ if (MSVC)
|
||||||
/wd4702 # unreachable code (when used with LTO)
|
/wd4702 # unreachable code (when used with LTO)
|
||||||
)
|
)
|
||||||
|
|
||||||
if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS)
|
if (USE_CCACHE OR SUYU_USE_PRECOMPILED_HEADERS)
|
||||||
# when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format
|
# when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format
|
||||||
# Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21
|
# Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21
|
||||||
add_compile_options(/Z7)
|
add_compile_options(/Z7)
|
||||||
|
@ -192,20 +192,20 @@ add_subdirectory(input_common)
|
||||||
add_subdirectory(frontend_common)
|
add_subdirectory(frontend_common)
|
||||||
add_subdirectory(shader_recompiler)
|
add_subdirectory(shader_recompiler)
|
||||||
|
|
||||||
if (YUZU_ROOM)
|
if (SUYU_ROOM)
|
||||||
add_subdirectory(dedicated_room)
|
add_subdirectory(dedicated_room)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_TESTS)
|
if (SUYU_TESTS)
|
||||||
add_subdirectory(tests)
|
add_subdirectory(tests)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_SDL2)
|
if (ENABLE_SDL2)
|
||||||
add_subdirectory(yuzu_cmd)
|
add_subdirectory(suyu_cmd)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_QT)
|
if (ENABLE_QT)
|
||||||
add_subdirectory(yuzu)
|
add_subdirectory(suyu)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_WEB_SERVICE)
|
if (ENABLE_WEB_SERVICE)
|
||||||
|
@ -214,5 +214,5 @@ endif()
|
||||||
|
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
add_subdirectory(android/app/src/main/jni)
|
add_subdirectory(android/app/src/main/jni)
|
||||||
target_include_directories(yuzu-android PRIVATE android/app/src/main)
|
target_include_directories(suyu-android PRIVATE android/app/src/main)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -172,9 +172,9 @@ android {
|
||||||
"-DENABLE_WEB_SERVICE=0", // Don't use telemetry
|
"-DENABLE_WEB_SERVICE=0", // Don't use telemetry
|
||||||
"-DBUNDLE_SPEEX=ON",
|
"-DBUNDLE_SPEEX=ON",
|
||||||
"-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
|
"-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
|
||||||
"-DYUZU_USE_BUNDLED_VCPKG=ON",
|
"-DSUYU_USE_BUNDLED_VCPKG=ON",
|
||||||
"-DYUZU_USE_BUNDLED_FFMPEG=ON",
|
"-DSUYU_USE_BUNDLED_FFMPEG=ON",
|
||||||
"-DYUZU_ENABLE_LTO=ON",
|
"-DSUYU_ENABLE_LTO=ON",
|
||||||
"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
|
"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -262,7 +262,7 @@ if (ANDROID)
|
||||||
target_compile_definitions(audio_core PRIVATE HAVE_OBOE)
|
target_compile_definitions(audio_core PRIVATE HAVE_OBOE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_USE_PRECOMPILED_HEADERS)
|
if (SUYU_USE_PRECOMPILED_HEADERS)
|
||||||
target_precompile_headers(audio_core PRIVATE precompiled_headers.h)
|
target_precompile_headers(audio_core PRIVATE precompiled_headers.h)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <span>
|
#include <span>
|
||||||
|
@ -208,7 +208,7 @@ CubebSink::CubebSink(std::string_view target_device_name) {
|
||||||
com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (cubeb_init(&ctx, "yuzu", nullptr) != CUBEB_OK) {
|
if (cubeb_init(&ctx, "suyu", nullptr) != CUBEB_OK) {
|
||||||
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -304,7 +304,7 @@ std::vector<std::string> ListCubebSinkDevices(bool capture) {
|
||||||
auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (cubeb_init(&ctx, "yuzu Device Enumerator", nullptr) != CUBEB_OK) {
|
if (cubeb_init(&ctx, "suyu Device Enumerator", nullptr) != CUBEB_OK) {
|
||||||
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
@ -352,7 +352,7 @@ bool IsCubebSuitable() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Init cubeb
|
// Init cubeb
|
||||||
if (cubeb_init(&ctx, "yuzu Latency Getter", nullptr) != CUBEB_OK) {
|
if (cubeb_init(&ctx, "suyu Latency Getter", nullptr) != CUBEB_OK) {
|
||||||
LOG_ERROR(Audio_Sink, "Cubeb failed to init, it is not suitable.");
|
LOG_ERROR(Audio_Sink, "Cubeb failed to init, it is not suitable.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -386,7 +386,7 @@ bool IsCubebSuitable() {
|
||||||
// Test opening a device with standard parameters
|
// Test opening a device with standard parameters
|
||||||
cubeb_devid output_device{0};
|
cubeb_devid output_device{0};
|
||||||
cubeb_devid input_device{0};
|
cubeb_devid input_device{0};
|
||||||
std::string name{"Yuzu test"};
|
std::string name{"Suyu test"};
|
||||||
cubeb_stream* stream{nullptr};
|
cubeb_stream* stream{nullptr};
|
||||||
|
|
||||||
if (cubeb_stream_init(ctx, &stream, name.c_str(), input_device, nullptr, output_device, ¶ms,
|
if (cubeb_stream_init(ctx, &stream, name.c_str(), input_device, nullptr, output_device, ¶ms,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
@ -32,11 +32,11 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::span<s16> samples) {
|
||||||
constexpr s32 min{std::numeric_limits<s16>::min()};
|
constexpr s32 min{std::numeric_limits<s16>::min()};
|
||||||
constexpr s32 max{std::numeric_limits<s16>::max()};
|
constexpr s32 max{std::numeric_limits<s16>::max()};
|
||||||
|
|
||||||
auto yuzu_volume{Settings::Volume()};
|
auto suyu_volume{Settings::Volume()};
|
||||||
if (yuzu_volume > 1.0f) {
|
if (suyu_volume > 1.0f) {
|
||||||
yuzu_volume = 0.6f + 20 * std::log10(yuzu_volume);
|
suyu_volume = 0.6f + 20 * std::log10(suyu_volume);
|
||||||
}
|
}
|
||||||
auto volume{system_volume * device_volume * yuzu_volume};
|
auto volume{system_volume * device_volume * suyu_volume};
|
||||||
|
|
||||||
if (system_channels == 6 && device_channels == 2) {
|
if (system_channels == 6 && device_channels == 2) {
|
||||||
// We're given 6 channels, but our device only outputs 2, so downmix.
|
// We're given 6 channels, but our device only outputs 2, so downmix.
|
||||||
|
|
|
@ -262,7 +262,7 @@ if (ANDROID)
|
||||||
target_link_libraries(common PRIVATE android)
|
target_link_libraries(common PRIVATE android)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (YUZU_USE_PRECOMPILED_HEADERS)
|
if (SUYU_USE_PRECOMPILED_HEADERS)
|
||||||
target_precompile_headers(common PRIVATE precompiled_headers.h)
|
target_precompile_headers(common PRIVATE precompiled_headers.h)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
@ -253,19 +253,19 @@ void AndroidKeyboard::SubmitNormalText(const ResultData& data) const {
|
||||||
|
|
||||||
void InitJNI(JNIEnv* env) {
|
void InitJNI(JNIEnv* env) {
|
||||||
s_software_keyboard_class = reinterpret_cast<jclass>(
|
s_software_keyboard_class = reinterpret_cast<jclass>(
|
||||||
env->NewGlobalRef(env->FindClass("org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard")));
|
env->NewGlobalRef(env->FindClass("org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard")));
|
||||||
s_keyboard_config_class = reinterpret_cast<jclass>(env->NewGlobalRef(
|
s_keyboard_config_class = reinterpret_cast<jclass>(env->NewGlobalRef(
|
||||||
env->FindClass("org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig")));
|
env->FindClass("org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig")));
|
||||||
s_keyboard_data_class = reinterpret_cast<jclass>(env->NewGlobalRef(
|
s_keyboard_data_class = reinterpret_cast<jclass>(env->NewGlobalRef(
|
||||||
env->FindClass("org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardData")));
|
env->FindClass("org/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardData")));
|
||||||
|
|
||||||
s_swkbd_execute_normal = env->GetStaticMethodID(
|
s_swkbd_execute_normal = env->GetStaticMethodID(
|
||||||
s_software_keyboard_class, "executeNormal",
|
s_software_keyboard_class, "executeNormal",
|
||||||
"(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/yuzu/yuzu_emu/"
|
"(Lorg/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/suyu/suyu_emu/"
|
||||||
"applets/keyboard/SoftwareKeyboard$KeyboardData;");
|
"applets/keyboard/SoftwareKeyboard$KeyboardData;");
|
||||||
s_swkbd_execute_inline = env->GetStaticMethodID(
|
s_swkbd_execute_inline = env->GetStaticMethodID(
|
||||||
s_software_keyboard_class, "executeInline",
|
s_software_keyboard_class, "executeInline",
|
||||||
"(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V");
|
"(Lorg/suyu/suyu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V");
|
||||||
}
|
}
|
||||||
|
|
||||||
void CleanupJNI(JNIEnv* env) {
|
void CleanupJNI(JNIEnv* env) {
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue