diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh index fbb2d9c1b0..ef8115b336 100755 --- a/.ci/scripts/linux/upload.sh +++ b/.ci/scripts/linux/upload.sh @@ -3,6 +3,8 @@ # 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" @@ -37,7 +39,7 @@ fi # Don't let AppImageLauncher ask to integrate EA if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then - echo "X-AppImage-Integrate=false" >> AppDir/org.yuzu_emu.yuzu.desktop + echo "X-AppImage-Integrate=false" >> AppDir/org.suyu_emu.suyu.desktop fi if [ "${RELEASE_NAME}" = "mainline" ]; then diff --git a/.gitmodules b/.gitmodules index aee4d41c97..318fa81c66 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,22 +9,22 @@ url = https://github.com/mozilla/cubeb.git [submodule "dynarmic"] path = externals/dynarmic - url = https://github.com/merryhime/dynarmic.git + url = https://gitlab.com/suyu-emu/dynarmic.git [submodule "libusb"] path = externals/libusb/libusb url = https://github.com/libusb/libusb.git [submodule "discord-rpc"] path = externals/discord-rpc - url = https://gitlab.com/suyu2/discord-rpc.git + url = https://gitlab.com/suyu-emu/discord-rpc.git [submodule "Vulkan-Headers"] path = externals/Vulkan-Headers url = https://github.com/KhronosGroup/Vulkan-Headers.git [submodule "sirit"] path = externals/sirit - url = https://gitlab.com/suyu2/sirit.git + url = https://gitlab.com/suyu-emu/sirit.git [submodule "mbedtls"] path = externals/mbedtls - url = https://gitlab.com/suyu2/mbedtls.git + url = https://gitlab.com/suyu-emu/mbedtls.git [submodule "xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git @@ -57,7 +57,7 @@ url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git [submodule "breakpad"] path = externals/breakpad - url = https://gitlab.com/suyu2/breakpad.git + url = https://gitlab.com/suyu-emu/breakpad.git [submodule "simpleini"] path = externals/simpleini url = https://github.com/brofield/simpleini.git @@ -67,69 +67,3 @@ [submodule "Vulkan-Utility-Libraries"] path = externals/Vulkan-Utility-Libraries url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git -[submodule "externals/cubeb"] - path = externals/cubeb - url = https://github.com/mozilla/cubeb.git -[submodule "externals/Vulkan-Headers"] - path = externals/Vulkan-Headers - url = https://github.com/KhronosGroup/Vulkan-Headers.git -[submodule "externals/breakpad"] - path = externals/breakpad - url = https://gitlab.com/suyu2/breakpad.git -[submodule "externals/VulkanMemoryAllocator"] - path = externals/VulkanMemoryAllocator - url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git -[submodule "externals/SDL"] - path = externals/SDL - url = https://github.com/libsdl-org/SDL.git -[submodule "externals/mbedtls"] - path = externals/mbedtls - url = https://gitlab.com/suyu2/mbedtls.git -[submodule "externals/Vulkan-Utility-Libraries"] - path = externals/Vulkan-Utility-Libraries - url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git -[submodule "externals/oaknut"] - path = externals/oaknut - url = https://github.com/merryhime/oaknut.git -[submodule "externals/sirit"] - path = externals/sirit - url = https://gitlab.com/suyu2/sirit.git -[submodule "externals/enet"] - path = externals/enet - url = https://github.com/lsalzman/enet.git -[submodule "externals/opus"] - path = externals/opus - url = https://github.com/xiph/opus.git -[submodule "externals/xbyak"] - path = externals/xbyak - url = https://github.com/herumi/xbyak.git -[submodule "externals/simpleini"] - path = externals/simpleini - url = https://github.com/brofield/simpleini.git -[submodule "externals/nx_tzdb/tzdb_to_nx"] - path = externals/nx_tzdb/tzdb_to_nx - url = https://github.com/lat9nq/tzdb_to_nx.git -[submodule "externals/cpp-jwt"] - path = externals/cpp-jwt - url = https://github.com/arun11299/cpp-jwt.git -[submodule "externals/vcpkg"] - path = externals/vcpkg - url = https://github.com/microsoft/vcpkg.git -[submodule "externals/cpp-httplib"] - path = externals/cpp-httplib - url = https://github.com/yhirose/cpp-httplib.git -[submodule "externals/libusb/libusb"] - path = externals/libusb/libusb - url = https://github.com/libusb/libusb.git -[submodule "externals/discord-rpc"] - path = externals/discord-rpc - url = https://gitlab.com/suyu2/discord-rpc.git -[submodule "externals/libadrenotools"] - path = externals/libadrenotools - url = https://github.com/bylaws/libadrenotools.git -[submodule "externals/ffmpeg/ffmpeg"] - path = externals/ffmpeg/ffmpeg - url = https://github.com/FFmpeg/FFmpeg.git -[submodule "externals/dynarmic"] - path = externals/dynarmic - url = https://gitlab.com/suyu2/dynarmic.git diff --git a/.reuse/dep5 b/.reuse/dep5 index b9ae96d0b1..5b6eea8bfd 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -9,15 +9,15 @@ Files: dist/english_plurals/* dist/qt_themes/*/icons/48x48/sd_card.png dist/qt_themes/*/icons/index.theme dist/qt_themes/default/style.qss -Copyright: yuzu Emulator Project +Copyright: suyu Emulator Project License: GPL-2.0-or-later Files: dist/qt_themes/default/icons/256x256/yuzu.png dist/yuzu.bmp dist/yuzu.icns - dist/yuzu.ico - dist/yuzu.svg -Copyright: yuzu Emulator Project + dist/suyu.ico + dist/suyu.svg +Copyright: suyu Emulator Project License: GPL-2.0-or-later Files: dist/qt_themes/qdarkstyle*/LICENSE.* diff --git a/CMakeLists.txt b/CMakeLists.txt index d460f1f7d3..fa32ccff84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ # 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) @@ -126,7 +128,7 @@ if (YUZU_USE_BUNDLED_VCPKG) set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads) set(NASM_VERSION "2.16.01") set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip) - set(NASM_DOWNLOAD_URL "https://github.com/yuzu-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip") + set(NASM_DOWNLOAD_URL "https://github.com/yuzu-mirror/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip") if (NOT EXISTS ${NASM_DESTINATION_PATH}) file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS) @@ -620,7 +622,7 @@ if (NOT CLANG_FORMAT) message(STATUS "Clang format not found! Downloading...") set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe") file(DOWNLOAD - https://github.com/yuzu-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe + https://github.com/yuzu-mirror/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe "${CLANG_FORMAT}" SHOW_PROGRESS STATUS DOWNLOAD_SUCCESS) if (NOT DOWNLOAD_SUCCESS EQUAL 0) @@ -720,13 +722,13 @@ endif() # https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html # https://www.freedesktop.org/software/appstream/docs/ if(ENABLE_QT AND UNIX AND NOT APPLE) - install(FILES "dist/org.yuzu_emu.yuzu.desktop" + install(FILES "dist/org.suyu_emu.suyu.desktop" DESTINATION "share/applications") - install(FILES "dist/yuzu.svg" + install(FILES "dist/suyu.svg" DESTINATION "share/icons/hicolor/scalable/apps" - RENAME "org.yuzu_emu.yuzu.svg") - install(FILES "dist/org.yuzu_emu.yuzu.xml" + RENAME "org.suyu_emu.suyu.svg") + install(FILES "dist/org.suyu_emu.suyu.xml" DESTINATION "share/mime/packages") - install(FILES "dist/org.yuzu_emu.yuzu.metainfo.xml" + install(FILES "dist/org.suyu_emu.suyu.metainfo.xml" DESTINATION "share/metainfo") endif() diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index a52148bd8f..a7be01ab80 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -7,17 +7,18 @@ # prefix_var: name of a variable which will be set with the path to the extracted contents function(download_bundled_external remote_path lib_name prefix_var) -set(package_base_url "https://github.com/yuzu-emu/") +set(package_base_url "https://gitlab.com/suyu-emu/") set(package_repo "no_platform") set(package_extension "no_platform") +set(package_head "?ref_type=heads") if (WIN32) - set(package_repo "ext-windows-bin/raw/master/") + set(package_repo "ext-windows-bin/-/raw/master/") set(package_extension ".7z") elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(package_repo "ext-linux-bin/raw/main/") + set(package_repo "ext-linux-bin/-/raw/main/") set(package_extension ".tar.xz") elseif (ANDROID) - set(package_repo "ext-android-bin/raw/main/") + set(package_repo "ext-android-bin/-/raw/main/") set(package_extension ".tar.xz") else() message(FATAL_ERROR "No package available for this platform") @@ -28,7 +29,7 @@ set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") if (NOT EXISTS "${prefix}") message(STATUS "Downloading binaries for ${lib_name}...") file(DOWNLOAD - ${package_url}${remote_path}${lib_name}${package_extension} + ${package_url}${remote_path}${lib_name}${package_extension}${package_head} "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" SHOW_PROGRESS) execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals") diff --git a/dist/org.yuzu_emu.yuzu.desktop b/dist/org.suyu_emu.suyu.desktop similarity index 70% rename from dist/org.yuzu_emu.yuzu.desktop rename to dist/org.suyu_emu.suyu.desktop index 51e191a8e5..0f734aea0c 100644 --- a/dist/org.yuzu_emu.yuzu.desktop +++ b/dist/org.suyu_emu.suyu.desktop @@ -1,16 +1,16 @@ -# SPDX-FileCopyrightText: 2018 yuzu Emulator Project +# SPDX-FileCopyrightText: 2024 suyu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later [Desktop Entry] Version=1.0 Type=Application -Name=yuzu +Name=suyu GenericName=Switch Emulator Comment=Nintendo Switch video game console emulator -Icon=org.yuzu_emu.yuzu -TryExec=yuzu -Exec=yuzu %f +Icon=org.suyu_emu.suyu +TryExec=suyu +Exec=suyu %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; -StartupWMClass=yuzu +StartupWMClass=suyu diff --git a/dist/org.yuzu_emu.yuzu.metainfo.xml b/dist/org.suyu_emu.suyu.metainfo.xml similarity index 52% rename from dist/org.yuzu_emu.yuzu.metainfo.xml rename to dist/org.suyu_emu.suyu.metainfo.xml index cfd1741748..619d4e3eeb 100644 --- a/dist/org.yuzu_emu.yuzu.metainfo.xml +++ b/dist/org.suyu_emu.suyu.metainfo.xml @@ -1,19 +1,19 @@ - org.yuzu_emu.yuzu + org.suyu_emu.suyu CC0-1.0 - yuzu + suyu Nintendo Switch emulator -

yuzu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.

+

suyu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.

The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.

-

For a full list of games yuzu support, please visit our Compatibility page.

+

For a full list of games suyu support, please visit our Compatibility page.

Check out our website for the latest news on exciting features, monthly progress reports, and more!

 @@ -24,19 +24,19 @@ SPDX-License-Identifier: CC0-1.0 switch emulator - https://yuzu-emu.org/ - https://github.com/yuzu-emu/yuzu/issues - https://yuzu-emu.org/wiki/faq/ - https://yuzu-emu.org/wiki/home/ - https://yuzu-emu.org/donate/ - https://www.transifex.com/projects/p/yuzu + https://suyu-emu.org/ + https://gitlab.com/suyu-emu/suyu/issues + https://suyu-emu.org/wiki/faq/ + https://suyu-emu.org/wiki/home/ + https://suyu-emu.org/donate/ + https://www.transifex.com/projects/p/suyu https://community.citra-emu.org/ - https://github.com/yuzu-emu/yuzu - https://yuzu-emu.org/wiki/contributing/ - org.yuzu_emu.yuzu.desktop + https://gitlab.com/suyu-emu/suyu + https://suyu-emu.org/wiki/contributing/ + org.suyu_emu.suyu.desktop - yuzu - yuzu-cmd + suyu + suyu-cmd pointing @@ -50,13 +50,13 @@ SPDX-License-Identifier: CC0-1.0 16384 GPL-3.0-or-later - yuzu Emulator Team + suyu Emulator Team - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png - https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png + https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png + https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png + https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png + https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png + https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png diff --git a/dist/org.yuzu_emu.yuzu.xml b/dist/org.suyu_emu.suyu.xml similarity index 83% rename from dist/org.yuzu_emu.yuzu.xml rename to dist/org.suyu_emu.suyu.xml index b774eb0c4e..05788c94e0 100644 --- a/dist/org.yuzu_emu.yuzu.xml +++ b/dist/org.suyu_emu.suyu.xml @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch homebrew executable NRO - + @@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch homebrew executable NSO - + @@ -25,7 +25,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch Package NSP - + @@ -33,7 +33,7 @@ SPDX-License-Identifier: GPL-2.0-or-later Nintendo Switch Card Image XCI - + diff --git a/dist/suyu.bmp b/dist/suyu.bmp new file mode 100644 index 0000000000..98df2a0da5 Binary files /dev/null and b/dist/suyu.bmp differ diff --git a/dist/suyu.ico b/dist/suyu.ico new file mode 100644 index 0000000000..031f75df97 Binary files /dev/null and b/dist/suyu.ico differ diff --git a/dist/yuzu.manifest b/dist/suyu.manifest similarity index 97% rename from dist/yuzu.manifest rename to dist/suyu.manifest index f2c8639a20..a22209ce20 100644 --- a/dist/yuzu.manifest +++ b/dist/suyu.manifest @@ -1,7 +1,7 @@ diff --git a/dist/suyu.svg b/dist/suyu.svg new file mode 100644 index 0000000000..381d5a5a57 --- /dev/null +++ b/dist/suyu.svg @@ -0,0 +1,4 @@ + + + + diff --git a/dist/yuzu.bmp b/dist/yuzu.bmp deleted file mode 100644 index 66f2f696f0..0000000000 Binary files a/dist/yuzu.bmp and /dev/null differ diff --git a/dist/yuzu.ico b/dist/yuzu.ico deleted file mode 100644 index df3be8464f..0000000000 Binary files a/dist/yuzu.ico and /dev/null differ diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index 4ae3b0e700..82f58fa9f3 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -932,7 +932,7 @@ Result ISystemSettingsServer::SetPrimaryAlbumStorage(PrimaryAlbumStorage primary Result ISystemSettingsServer::GetBatteryLot(Out out_battery_lot) { LOG_INFO(Service_SET, "called"); - *out_battery_lot = BatteryLot("YUZU0EMULATOR14022024"); + *out_battery_lot = {"YUZU0EMULATOR14022024"}; R_SUCCEED(); } diff --git a/src/dedicated_room/yuzu_room.rc b/src/dedicated_room/yuzu_room.rc index a08957684c..bde753b0bd 100644 --- a/src/dedicated_room/yuzu_room.rc +++ b/src/dedicated_room/yuzu_room.rc @@ -1,6 +1,8 @@ -// SPDX-FileCopyrightText: 2017 Citra Emulator Project +// SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +// Modified by JuanCStar on 2024/03/06 + #include "winresrc.h" ///////////////////////////////////////////////////////////////////////////// // @@ -9,7 +11,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -YUZU_ICON ICON "../../dist/yuzu.ico" +SUYU_ICON ICON "../../dist/suyu.ico" ///////////////////////////////////////////////////////////////////////////// @@ -17,4 +19,4 @@ YUZU_ICON ICON "../../dist/yuzu.ico" // RT_MANIFEST // -0 RT_MANIFEST "../../dist/yuzu.manifest" +0 RT_MANIFEST "../../dist/suyu.manifest" diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 0259a8c293..1e34ed3f78 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -1,6 +1,8 @@ # SPDX-FileCopyrightText: 2018 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later +# Modified by JuanCStar on 2024/03/06 + set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) @@ -229,8 +231,8 @@ add_executable(yuzu vk_device_info.h compatdb.cpp compatdb.h - yuzu.qrc - yuzu.rc + suyu.qrc + suyu.rc ) if (YUZU_CRASH_DUMPS) diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp index eeff543599..49d03fb27b 100644 --- a/src/yuzu/about_dialog.cpp +++ b/src/yuzu/about_dialog.cpp @@ -1,6 +1,8 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +// Modified by JuanCStar on 2024/03/06 + #include #include #include "common/scm_rev.h" @@ -13,19 +15,19 @@ AboutDialog::AboutDialog(QWidget* parent) const auto description = std::string(Common::g_scm_desc); const auto build_id = std::string(Common::g_build_id); - const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description); + const auto suyu_build = fmt::format("suyu Development Build | {}-{}", branch_name, description); const auto override_build = fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id); - const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build; + const auto suyu_build_version = override_build.empty() ? suyu_build : override_build; ui->setupUi(this); // Try and request the icon from Qt theme (Linux?) - const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("org.yuzu_emu.yuzu")); - if (!yuzu_logo.isNull()) { - ui->labelLogo->setPixmap(yuzu_logo.pixmap(200)); + const QIcon suyu_logo = QIcon::fromTheme(QStringLiteral("org.suyu_emu.suyu")); + if (!suyu_logo.isNull()) { + ui->labelLogo->setPixmap(suyu_logo.pixmap(200)); } ui->labelBuildInfo->setText( - ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version), + ui->labelBuildInfo->text().arg(QString::fromStdString(suyu_build_version), QString::fromUtf8(Common::g_build_date).left(10))); } diff --git a/src/yuzu/about_dialog.h b/src/yuzu/about_dialog.h index 3c4e71ee6c..5a0a93cc30 100644 --- a/src/yuzu/about_dialog.h +++ b/src/yuzu/about_dialog.h @@ -1,6 +1,8 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +// Modified by JuanCStar on 2024/03/06 + #pragma once #include diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c0c0a19b85..da235bb97a 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1,6 +1,8 @@ // SPDX-FileCopyrightText: 2014 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +// Modified by JuanCStar on 2024/03/06 + #include #include #include @@ -4551,10 +4553,10 @@ void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_vie const auto description = std::string(Common::g_scm_desc); const auto build_id = std::string(Common::g_build_id); - const auto yuzu_title = fmt::format("yuzu | {}-{}", branch_name, description); + const auto suyu_title = fmt::format("suyu | {}-{}", branch_name, description); const auto override_title = fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id); - const auto window_title = override_title.empty() ? yuzu_title : override_title; + const auto window_title = override_title.empty() ? suyu_title : override_title; if (title_name.empty()) { setWindowTitle(QString::fromStdString(window_title)); @@ -5303,7 +5305,7 @@ int main(int argc, char* argv[]) { // Fix the Wayland appId. This needs to match the name of the .desktop file without the .desktop // suffix. - QGuiApplication::setDesktopFileName(QStringLiteral("org.yuzu_emu.yuzu")); + QGuiApplication::setDesktopFileName(QStringLiteral("org.suyu_emu.suyu")); #endif SetHighDPIAttributes(); diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index 85dc1f2f67..f21bc09890 100644 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -11,11 +11,11 @@ - yuzu + suyu - - :/img/yuzu.ico:/img/yuzu.ico + + :/img/suyu.ico:/img/suyu.ico QTabWidget::Rounded @@ -477,7 +477,7 @@ - + diff --git a/src/yuzu/suyu.qrc b/src/yuzu/suyu.qrc new file mode 100644 index 0000000000..12e46e330c --- /dev/null +++ b/src/yuzu/suyu.qrc @@ -0,0 +1,12 @@ + + + + + ../../dist/suyu.ico + + diff --git a/src/yuzu/yuzu.rc b/src/yuzu/suyu.rc similarity index 67% rename from src/yuzu/yuzu.rc rename to src/yuzu/suyu.rc index 1fc74d0659..1d4d6a81f9 100644 --- a/src/yuzu/yuzu.rc +++ b/src/yuzu/suyu.rc @@ -1,6 +1,8 @@ -// SPDX-FileCopyrightText: 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +// Modified by JuanCStar on 2024/03/06 + #include "winresrc.h" ///////////////////////////////////////////////////////////////////////////// // @@ -11,7 +13,7 @@ // remains consistent on all systems. // QT requires that the default application icon is named IDI_ICON1 -IDI_ICON1 ICON "../../dist/yuzu.ico" +IDI_ICON1 ICON "../../dist/suyu.ico" ///////////////////////////////////////////////////////////////////////////// @@ -19,4 +21,4 @@ IDI_ICON1 ICON "../../dist/yuzu.ico" // RT_MANIFEST // -0 RT_MANIFEST "../../dist/yuzu.manifest" +0 RT_MANIFEST "../../dist/suyu.manifest" diff --git a/src/yuzu/yuzu.qrc b/src/yuzu/yuzu.qrc deleted file mode 100644 index 855df05fd1..0000000000 --- a/src/yuzu/yuzu.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - - - ../../dist/yuzu.ico - - diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index ebd8fd7387..8bedd8b9e3 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt @@ -1,6 +1,8 @@ # SPDX-FileCopyrightText: 2018 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later +# Modified by JuanCStar on 2024/03/06 + # Credits to Samantas5855 and others for this function. function(create_resource file output filename) # Read hex data from file @@ -25,7 +27,7 @@ add_executable(yuzu-cmd sdl_config.cpp sdl_config.h yuzu.cpp - yuzu.rc + suyu.rc ) target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common) @@ -35,7 +37,7 @@ if (MSVC) endif() target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) -create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") +create_resource("../../dist/suyu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers) diff --git a/src/yuzu_cmd/yuzu.rc b/src/yuzu_cmd/suyu.rc similarity index 63% rename from src/yuzu_cmd/yuzu.rc rename to src/yuzu_cmd/suyu.rc index e230cf6809..3f11e859ac 100644 --- a/src/yuzu_cmd/yuzu.rc +++ b/src/yuzu_cmd/suyu.rc @@ -1,6 +1,8 @@ -// SPDX-FileCopyrightText: 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +// Modified by JuanCStar on 2024/03/06 + #include "winresrc.h" ///////////////////////////////////////////////////////////////////////////// // @@ -9,7 +11,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -YUZU_ICON ICON "../../dist/yuzu.ico" +SUYU_ICON ICON "../../dist/suyu.ico" ///////////////////////////////////////////////////////////////////////////// @@ -17,4 +19,4 @@ YUZU_ICON ICON "../../dist/yuzu.ico" // RT_MANIFEST // -0 RT_MANIFEST "../../dist/yuzu.manifest" +0 RT_MANIFEST "../../dist/suyu.manifest"