diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 7bba01d62a..f253e398c4 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -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 \ diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index ef8115b336..e99d6cafbc 100755 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a47a72a60..3aef932eee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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." \ No newline at end of file + - git submodule update --init --depth 1 --recursive + - bash .ci/scripts/linux/docker.sh + - bash .ci/scripts/linux/upload.sh + artifacts: + paths: + - artifacts/* diff --git a/.reuse/dep5 b/.reuse/dep5 index 5b6eea8bfd..8d956768cb 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 94a67a64f0..fa611c41b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index 614499a236..d189a00727 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -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$<$:d>.* Qt5Network$<$:d>.* ) - if (YUZU_USE_QT_MULTIMEDIA) + if (SUYU_USE_QT_MULTIMEDIA) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} Qt5Multimedia$<$:d>.* ) diff --git a/README.md b/README.md index 81814ff3a4..f69e22d941 100644 --- a/README.md +++ b/README.md @@ -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.


- suyu + suyu
suyu
@@ -24,42 +24,37 @@ It is written in C++ with portability in mind, and we actively maintain builds f

- Compatibility | + Discord | + Status | Development | - Building | - Pipelines | Downloads | + Building | Support | - License + License | + Pipelines

## 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 diff --git a/dist/icns_generator.sh b/dist/icns_generator.sh new file mode 100755 index 0000000000..8fe9f4ae4e --- /dev/null +++ b/dist/icns_generator.sh @@ -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 diff --git a/dist/languages/ar.ts b/dist/languages/ar.ts index fbd7fa3990..0c428dec10 100644 --- a/dist/languages/ar.ts +++ b/dist/languages/ar.ts @@ -6838,7 +6838,7 @@ Debug Message: - Exit yuzu + Exit suyu الخروج من يوزو diff --git a/dist/languages/ca.ts b/dist/languages/ca.ts index 7c71d92ccc..a00d77d964 100644 --- a/dist/languages/ca.ts +++ b/dist/languages/ca.ts @@ -6875,7 +6875,7 @@ Debug Message: - Exit yuzu + Exit suyu diff --git a/dist/languages/cs.ts b/dist/languages/cs.ts index 293efc62f2..46b6cfa66f 100644 --- a/dist/languages/cs.ts +++ b/dist/languages/cs.ts @@ -6859,7 +6859,7 @@ Debug Message: - Exit yuzu + Exit suyu Ukončit yuzu diff --git a/dist/languages/da.ts b/dist/languages/da.ts index bfdcb1a419..d461749a43 100644 --- a/dist/languages/da.ts +++ b/dist/languages/da.ts @@ -6863,7 +6863,7 @@ Debug Message: - Exit yuzu + Exit suyu diff --git a/dist/languages/de.ts b/dist/languages/de.ts index 1a3a614eca..238c296d2b 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -6886,7 +6886,7 @@ Debug Nachricht: - Exit yuzu + Exit suyu yuzu verlassen diff --git a/dist/languages/el.ts b/dist/languages/el.ts index 65a7790d81..4ffeb8723d 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -6859,7 +6859,7 @@ Debug Message: - Exit yuzu + Exit suyu diff --git a/dist/languages/es.ts b/dist/languages/es.ts index ef457e4959..d8cc8d0cec 100644 --- a/dist/languages/es.ts +++ b/dist/languages/es.ts @@ -6932,7 +6932,7 @@ Mensaje de depuración: - Exit yuzu + Exit suyu Cerrar yuzu diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index 3bb8dfb4d8..6f68aa3a6b 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -6925,7 +6925,7 @@ Message de débogage : - Exit yuzu + Exit suyu Quitter yuzu diff --git a/dist/languages/hu.ts b/dist/languages/hu.ts index 2640d3ddfe..b0b503fa05 100644 --- a/dist/languages/hu.ts +++ b/dist/languages/hu.ts @@ -6899,7 +6899,7 @@ Hibakereső üzenet: - Exit yuzu + Exit suyu Kilépés a yuzuból diff --git a/dist/languages/id.ts b/dist/languages/id.ts index c9c2da0483..5aff83707c 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -6916,7 +6916,7 @@ Debug Message: - Exit yuzu + Exit suyu diff --git a/dist/languages/it.ts b/dist/languages/it.ts index 569c54e628..cb324be5f2 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -6895,7 +6895,7 @@ Messaggio di debug: - Exit yuzu + Exit suyu Esci da yuzu diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 1afb1ec915..55b11fd713 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -6881,7 +6881,7 @@ Debug Message: - Exit yuzu + Exit suyu yuzuを終了 diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index e650dd07ca..2345545cfa 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -6880,7 +6880,7 @@ Debug Message: - Exit yuzu + Exit suyu yuzu 종료 diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 69484093a5..f5906e7f91 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -6885,7 +6885,7 @@ Feilmelding: - Exit yuzu + Exit suyu Avslutt yuzu diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index 2368db7ca2..ed595bb664 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -6873,7 +6873,7 @@ Debug-bericht: - Exit yuzu + Exit suyu yuzu afsluiten diff --git a/dist/languages/pl.ts b/dist/languages/pl.ts index 2c613c3cc4..358e2b6f48 100644 --- a/dist/languages/pl.ts +++ b/dist/languages/pl.ts @@ -6876,7 +6876,7 @@ Komunikat debugowania: - Exit yuzu + Exit suyu Wyjdź z yuzu diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index ed68411ee9..4e3c4996f7 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -6934,7 +6934,7 @@ Mensagem de depuração: - Exit yuzu + Exit suyu Sair do yuzu diff --git a/dist/languages/pt_PT.ts b/dist/languages/pt_PT.ts index 17f3dc840d..342faedbfe 100644 --- a/dist/languages/pt_PT.ts +++ b/dist/languages/pt_PT.ts @@ -6917,7 +6917,7 @@ Mensagem de depuração: - Exit yuzu + Exit suyu Sair do yuzu diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index 366168a64b..5bc9d21364 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -6930,7 +6930,7 @@ Debug Message: - Exit yuzu + Exit suyu Выйти из yuzu diff --git a/dist/languages/sv.ts b/dist/languages/sv.ts index 52bb2971e1..13d81b97c4 100644 --- a/dist/languages/sv.ts +++ b/dist/languages/sv.ts @@ -6854,7 +6854,7 @@ Debug Message: - Exit yuzu + Exit suyu diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index dd17a8f111..8734556771 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -6876,7 +6876,7 @@ Debug Message: - Exit yuzu + Exit suyu Yuzu'dan çık diff --git a/dist/languages/uk.ts b/dist/languages/uk.ts index 81931e2ca2..5c831cd9b6 100644 --- a/dist/languages/uk.ts +++ b/dist/languages/uk.ts @@ -6889,7 +6889,7 @@ Debug Message: - Exit yuzu + Exit suyu Вийти з yuzu diff --git a/dist/languages/vi.ts b/dist/languages/vi.ts index 41e5243bf4..744760f56a 100644 --- a/dist/languages/vi.ts +++ b/dist/languages/vi.ts @@ -6882,7 +6882,7 @@ Tin nhắn gỡ lỗi: - Exit yuzu + Exit suyu Thoát yuzu diff --git a/dist/languages/vi_VN.ts b/dist/languages/vi_VN.ts index 12a871e416..8d57d78d41 100644 --- a/dist/languages/vi_VN.ts +++ b/dist/languages/vi_VN.ts @@ -6882,7 +6882,7 @@ Tin nhắn gỡ lỗi: - Exit yuzu + Exit suyu Thoát yuzu diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 1ed193a97e..92ed22f38e 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -6930,7 +6930,7 @@ Debug Message: - Exit yuzu + Exit suyu 退出 yuzu diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 0a4752b75d..7825ddb130 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -6926,7 +6926,7 @@ Debug Message: - Exit yuzu + Exit suyu 離開 yuzu diff --git a/dist/org.suyu_emu.suyu.desktop b/dist/org.suyu_emu.suyu.desktop index 0f619d7e7e..c877c556ca 100644 --- a/dist/org.suyu_emu.suyu.desktop +++ b/dist/org.suyu_emu.suyu.desktop @@ -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; diff --git a/dist/suyu.icns b/dist/suyu.icns new file mode 100644 index 0000000000..4e3df71e7d Binary files /dev/null and b/dist/suyu.icns differ diff --git a/dist/yuzu.icns b/dist/yuzu.icns deleted file mode 100644 index fea288c952..0000000000 Binary files a/dist/yuzu.icns and /dev/null differ diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b73542b317..8e9d648d11 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -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 #include