Merge branch 'dev' of https://gitlab.com/suyu-emu/suyu into dev

This commit is contained in:
Kawaii 2024-03-07 12:34:32 -06:00
commit d07e6bb681
38 changed files with 94 additions and 110 deletions

View File

@ -17,8 +17,8 @@ cmake .. \
-DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DDISPLAY_VERSION=$1 \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DENABLE_QT_TRANSLATION=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \
-DENABLE_QT_TRANSLATION=OFF \
-DUSE_DISCORD_PRESENCE=ON \
-DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
-DYUZU_USE_BUNDLED_FFMPEG=ON \
@ -49,9 +49,10 @@ DESTDIR="$PWD/AppDir" ninja install
rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester
# Download tools needed to build an AppImage
wget -nc https://raw.githubusercontent.com/yuzu-emu/ext-linux-bin/main/appimage/deploy-linux.sh
wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh
wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so
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/exec-x86_64.so
wget -nc https://gitlab.com/suyu-emu/AppImageKit-checkrt/-/raw/old/AppRun.sh
# Set executable bit
chmod 755 \
deploy-linux.sh \

View File

@ -3,8 +3,6 @@
# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
# Modified by JuanCStar on 2024/03/06
. .ci/scripts/common/pre-upload.sh
APPIMAGE_NAME="yuzu-${RELEASE_NAME}-${GITDATE}-${GITREV}.AppImage"
@ -29,7 +27,7 @@ fi
# Build an AppImage
cd build
wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/appimagetool-x86_64.AppImage
wget -nc https://gitlab.com/suyu-emu/ext-linux-bin/-/raw/main/appimage/appimagetool-x86_64.AppImage
chmod 755 appimagetool-x86_64.AppImage
# if FUSE is not available, then fallback to extract and run

View File

@ -1,45 +1,19 @@
# This file is a template, and might need editing before it works on your project.
# This is a sample GitLab CI/CD configuration file that should run without any modifications.
# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts,
# it uses echo commands to simulate the pipeline execution.
#
# A pipeline is composed of independent jobs that run scripts, grouped into stages.
# Stages run in sequential order, but jobs within stages run in parallel.
#
# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages
#
# You can copy and paste this template into a new `.gitlab-ci.yml` file.
# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword.
#
# To contribute improvements to CI/CD templates, please follow the Development guide at:
# https://docs.gitlab.com/ee/development/cicd/templates.html
# This specific template is located at:
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
stages: # List of stages for jobs, and their order of execution
stages:
- build
build-ubuntu: # This job runs in the build stage, which runs first.
build-linux:
stage: build
image: ubuntu:latest # Maybe replace with image with more required dependencies
image: debian:trixie # Maybe replace with image with more required dependencies
resource_group: linux-ci
variables:
RELEASE_NAME: mainline
before_script:
- apt update --yes
- apt install --yes cmake gcc g++ git
- apt-get update --yes
- apt-get install --yes wget ccache cmake gcc g++ nasm git patchelf xz-utils ninja-build autoconf glslang-tools pkg-config catch2 libtool nlohmann-json3-dev qtbase5-dev qtbase5-private-dev qtmultimedia5-dev libqt5gui5 libva-dev libavcodec-dev libavfilter-dev libboost-dev libboost-context-dev libfmt-dev zlib1g-dev libzstd-dev libcurl4-openssl-dev liblz4-dev llvm-17-dev libedit-dev libssl-dev mesa-common-dev libzydis-dev libusb-dev libpulse-dev
script:
- echo "Compiling the code..."
- git submodule update --init --recursive
- ls -la
# TODO: Add build instructions for linux
- echo "Compile complete."
build-win:
stage: build
tags:
- shared-windows
- windows
- windows-1809
script:
- echo "Compiling the code..."
- dir
# TODO: Add build instructions for windows
- echo "Compile complete."
- git submodule update --init --depth 1 --recursive
- bash .ci/scripts/linux/docker.sh
- bash .ci/scripts/linux/upload.sh
artifacts:
paths:
- artifacts/*

View File

@ -14,7 +14,7 @@ License: GPL-2.0-or-later
Files: dist/qt_themes/default/icons/256x256/yuzu.png
dist/yuzu.bmp
dist/yuzu.icns
dist/suyu.icns
dist/suyu.ico
dist/suyu.svg
Copyright: suyu Emulator Project

View File

@ -1,8 +1,6 @@
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
# Modified by JuanCStar on 2024/03/06
cmake_minimum_required(VERSION 3.22)
project(yuzu)
@ -40,7 +38,7 @@ option(YUZU_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(YUZU_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)
@ -66,7 +64,7 @@ option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)
option(YUZU_ENABLE_PORTABLE "Allow yuzu 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)
@ -264,7 +262,7 @@ endif()
message(STATUS "Target architecture: ${ARCHITECTURE}")
if (UNIX)
add_definitions(-DYUZU_UNIX=1)
add_definitions(-DSUYU_UNIX=1)
endif()
if (ARCHITECTURE_arm64 AND (ANDROID OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
@ -373,7 +371,7 @@ function(set_yuzu_qt_components)
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
list(APPEND YUZU_QT_COMPONENTS2 DBus)
endif()
if (YUZU_USE_QT_MULTIMEDIA)
if (SUYU_USE_QT_MULTIMEDIA)
list(APPEND YUZU_QT_COMPONENTS2 Multimedia)
endif()
if (YUZU_USE_QT_WEB_ENGINE)
@ -411,7 +409,7 @@ if(ENABLE_QT)
set(QT_DEFAULT_MAJOR_VERSION 5)
set(QT_MAJOR_VERSION 5)
set(YUZU_USE_QT_MULTIMEDIA ON)
set(SUYU_USE_QT_MULTIMEDIA ON)
# Check for system Qt on Linux, fallback to bundled Qt
if (UNIX AND NOT APPLE)
if (NOT YUZU_USE_BUNDLED_QT)
@ -518,7 +516,7 @@ if(ENABLE_QT)
set(YUZU_QT_NO_CMAKE_SYSTEM_PATH "NO_CMAKE_SYSTEM_PATH")
# Binary package for Qt5 has Qt Multimedia
set(YUZU_USE_QT_MULTIMEDIA ON CACHE BOOL "Use Qt Multimedia" FORCE)
set(SUYU_USE_QT_MULTIMEDIA ON CACHE BOOL "Use Qt Multimedia" FORCE)
endif()
set_yuzu_qt_components()

View File

@ -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
function(copy_yuzu_Qt5_deps target_dir)
@ -33,7 +33,7 @@ function(copy_yuzu_Qt5_deps target_dir)
Qt5Widgets$<$<CONFIG:Debug>:d>.*
Qt5Network$<$<CONFIG:Debug>:d>.*
)
if (YUZU_USE_QT_MULTIMEDIA)
if (SUYU_USE_QT_MULTIMEDIA)
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
Qt5Multimedia$<$<CONFIG:Debug>:d>.*
)

View File

@ -3,16 +3,16 @@ SPDX-FileCopyrightText: 2024 suyu emulator project
SPDX-License-Identifier: GPL v3
-->
**Note**: We do not support or condone piracy in any form. In order to use Suyu, you'll need keys from your real Switch system, and games which you have legally obtained and paid for. We do not intend to make money or profit from this project.
**Note**: We do not support or condone piracy in any form. In order to use suyu, you'll need keys from your real Switch system, and games which you have legally obtained and paid for. We do not intend to make money or profit from this project.
We are in great need of developers. Please join our Discord server below if you can help out with the project.
This repo is based on Yuzu EA 4176. Please contribute if you can!
We're in need of developers. Please join our Discord server below if you want to contribute!
This repo is based on Yuzu EA 4176.
<hr />
<h1 align="center">
<br>
<a href="https://gitlab.com/suyu-emu/suyu"><img src="dist/readme/suyu__Logo-Pill.svg" alt="suyu" height="128"></a>
<a href="https://suyu.dev"><img src="dist/readme/suyu__Logo-Pill.svg" alt="suyu" height="128"></a>
<br>
<b>suyu</b>
<br>
@ -24,42 +24,37 @@ It is written in C++ with portability in mind, and we actively maintain builds f
</h4>
<p align="center">
<a href="#compatibility">Compatibility</a> |
<a href="https://discord.gg/2gQRBp44KT">Discord</a> |
<a href="#status">Status</a> |
<a href="#development">Development</a> |
<a href="#building">Building</a> |
<a href="https://gitlab.com/suyu-emu/suyu/-/pipelines">Pipelines</a> |
<a href="#downloads">Downloads</a> |
<a href="#building">Building</a> |
<a href="#support">Support</a> |
<a href="#license">License</a>
<a href="#license">License</a> |
<a href="https://gitlab.com/suyu-emu/suyu/-/pipelines">Pipelines</a>
</p>
## Status
We are trying to get the builds working. We are in need of developers. Join our Discord to contribute.
Although we're able to make builds, we don't have a version ready for distribution yet. But we can always use more help! You can make a merge request if you'd like to see something changed, or you can [chat with other developers to find out what needs work](https://discord.gg/2gQRBp44KT).
**Note**: This README is a fork of the original project's README, most links are broken!
## Compatibility
The emulator is capable of running most commercial games at full speed, provided you meet the [necessary hardware requirements](https://suyu-emu.org/help/quickstart/#hardware-requirements).
For a full list of games suyu supports, please visit our [Compatibility page](https://gitlab.com/suyu-emu/suyu/-/wikis/Compatibility).
Check out our [website](https://suyu.dev) for the latest news on exciting features, monthly progress reports, and more!
**Note**: We try to update this README whenever we can, but some links might be broken, and some information may be outdated or irrelevant.
## Development
This project is completely free and open source, this project is made possible by many people who share the same interest.
This project is completely free and open source, and anyone can contribute to help improve suyu.
Most of the development happens on GitLab. For development discussion, please join us on [Discord](https://discord.gg/2gQRBp44KT).
If you want to contribute, please take a look at the [Contributor's Guide](https://gitlab.com/suyu-emu/suyu/-/wikis/Contributing) and [Developer Information](https://gitlab.com/suyu-emu/suyu/-/wikis/Developer-Information).
You can also contact any of the developers on Discord in order to know about the current state of the emulator.
You can also contact any of the developers on Discord to learn more about the current state of suyu.
## Downloads
* __Windows__: [Legacy Artifacts](https://github.com/pineappleea/pineapple-src/releases)
* __Linux__: [Legacy Artifacts](https://github.com/pineappleea/pineapple-src/releases)
* __Windows__: WIP
* __Linux__: WIP
We don't have any official builds yet! If any website or person is claiming to have a build for suyu, take that with a grain of salt, because it might contain malware. Until we do have an official build, it might be a better idea to keep using the last version of yuzu.
## Building
@ -70,7 +65,7 @@ You can also contact any of the developers on Discord in order to know about the
## Support
This project is completely free and open source, this project is made possible by many people who share the same interest. Please join the Discord server [here](https://discord.gg/2gQRBp44KT) to contribute.
If you have any questions, don't hesitate to ask us on [Discord](https://discord.gg/2gQRBp44KT). We don't bite!
## License

14
dist/icns_generator.sh vendored Executable file
View File

@ -0,0 +1,14 @@
mkdir suyu.iconset
convert -background none -resize 16x16 suyu.svg suyu.iconset/icon_16x16.png;
convert -background none -resize 32x32 suyu.svg suyu.iconset/icon_16x16@2x.png;
convert -background none -resize 32x32 suyu.svg suyu.iconset/icon_32x32.png;
convert -background none -resize 64x64 suyu.svg suyu.iconset/icon_32x32@2x.png;
convert -background none -resize 128x128 suyu.svg suyu.iconset/icon_128x128.png;
convert -background none -resize 256x256 suyu.svg suyu.iconset/icon_256x256.png;
convert -background none -resize 256x256 suyu.svg suyu.iconset/icon_128x128@2x.png;
convert -background none -resize 512x512 suyu.svg suyu.iconset/icon_256x256@2x.png;
convert -background none -resize 512x512 suyu.svg suyu.iconset/icon_512x512.png;
convert -background none -resize 1024x1024 suyu.svg suyu.iconset/icon_512x512@2x.png;
iconutil -c icns suyu.iconset
rm -rf suyu.iconset

View File

@ -6838,7 +6838,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>الخروج من يوزو</translation>
</message>
<message>

View File

@ -6875,7 +6875,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation type="unfinished"/>
</message>
<message>

View File

@ -6859,7 +6859,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Ukončit yuzu</translation>
</message>
<message>

View File

@ -6863,7 +6863,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation type="unfinished"/>
</message>
<message>

View File

@ -6886,7 +6886,7 @@ Debug Nachricht:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>yuzu verlassen</translation>
</message>
<message>

View File

@ -6859,7 +6859,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation type="unfinished"/>
</message>
<message>

View File

@ -6932,7 +6932,7 @@ Mensaje de depuración: </translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Cerrar yuzu</translation>
</message>
<message>

View File

@ -6925,7 +6925,7 @@ Message de débogage : </translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Quitter yuzu</translation>
</message>
<message>

View File

@ -6899,7 +6899,7 @@ Hibakereső üzenet:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Kilépés a yuzuból</translation>
</message>
<message>

View File

@ -6916,7 +6916,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation type="unfinished"/>
</message>
<message>

View File

@ -6895,7 +6895,7 @@ Messaggio di debug:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Esci da yuzu</translation>
</message>
<message>

View File

@ -6881,7 +6881,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>yuzuを終了</translation>
</message>
<message>

View File

@ -6880,7 +6880,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>yuzu </translation>
</message>
<message>

View File

@ -6885,7 +6885,7 @@ Feilmelding:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Avslutt yuzu</translation>
</message>
<message>

View File

@ -6873,7 +6873,7 @@ Debug-bericht: </translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>yuzu afsluiten</translation>
</message>
<message>

View File

@ -6876,7 +6876,7 @@ Komunikat debugowania:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Wyjdź z yuzu</translation>
</message>
<message>

View File

@ -6934,7 +6934,7 @@ Mensagem de depuração:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Sair do yuzu</translation>
</message>
<message>

View File

@ -6917,7 +6917,7 @@ Mensagem de depuração:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Sair do yuzu</translation>
</message>
<message>

View File

@ -6930,7 +6930,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Выйти из yuzu</translation>
</message>
<message>

View File

@ -6854,7 +6854,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation type="unfinished"/>
</message>
<message>

View File

@ -6876,7 +6876,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Yuzu&apos;dan çık</translation>
</message>
<message>

View File

@ -6889,7 +6889,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Вийти з yuzu</translation>
</message>
<message>

View File

@ -6882,7 +6882,7 @@ Tin nhắn gỡ lỗi:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Thoát yuzu</translation>
</message>
<message>

View File

@ -6882,7 +6882,7 @@ Tin nhắn gỡ lỗi:</translation>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>Thoát yuzu</translation>
</message>
<message>

View File

@ -6930,7 +6930,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation>退 yuzu</translation>
</message>
<message>

View File

@ -6926,7 +6926,7 @@ Debug Message: </source>
</message>
<message>
<location filename="../../src/yuzu/uisettings.h" line="242"/>
<source>Exit yuzu</source>
<source>Exit suyu</source>
<translation> yuzu</translation>
</message>
<message>

View File

@ -8,8 +8,8 @@ Name=suyu
GenericName=Switch Emulator
Comment=Nintendo Switch video game console emulator
Icon=org.suyu_emu.suyu
TryExec=suyu
Exec=suyu %f
TryExec=yuzu
Exec=yuzu %f
Categories=Game;Emulator;Qt;
MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
Keywords=Nintendo;Switch;

BIN
dist/suyu.icns vendored Normal file

Binary file not shown.

BIN
dist/yuzu.icns vendored

Binary file not shown.

View File

@ -1,7 +1,11 @@
// SPDX-FileCopyrightText: 2014 Citra Emulator Project & 2024 suyu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
<<<<<<< HEAD
// Modified by KawaiiBunga on <2024/03/07>
=======
// Modified by palfaiate on <2024/03/07>
>>>>>>> ba5b604f9a095524e7ae479b6c10d4e35f80e98f
#include <cinttypes>
#include <clocale>