summaryrefslogtreecommitdiff
path: root/src/citron_cmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/citron_cmd')
-rw-r--r--src/citron_cmd/CMakeLists.txt38
-rw-r--r--src/citron_cmd/citron.cpp12
-rw-r--r--src/citron_cmd/citron.rc6
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2.cpp14
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2.h4
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp8
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2_gl.h4
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2_null.cpp10
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2_null.h4
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp8
-rw-r--r--src/citron_cmd/emu_window/emu_window_sdl2_vk.h4
-rw-r--r--src/citron_cmd/precompiled_headers.h2
-rw-r--r--src/citron_cmd/sdl_config.cpp4
-rw-r--r--src/citron_cmd/sdl_config.h2
14 files changed, 60 insertions, 60 deletions
diff --git a/src/citron_cmd/CMakeLists.txt b/src/citron_cmd/CMakeLists.txt
index ebd8fd738..d841a5494 100644
--- a/src/citron_cmd/CMakeLists.txt
+++ b/src/citron_cmd/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2025 citron Homebrew Project
# SPDX-License-Identifier: GPL-2.0-or-later
# Credits to Samantas5855 and others for this function.
@@ -12,7 +12,7 @@ function(create_resource file output filename)
file(WRITE "${PROJECT_BINARY_DIR}/dist/${output}" "const unsigned char ${filename}[] = {${filedata}};\nconst unsigned ${filename}_size = sizeof(${filename});\n")
endfunction()
-add_executable(yuzu-cmd
+add_executable(citron-cmd
emu_window/emu_window_sdl2.cpp
emu_window/emu_window_sdl2.h
emu_window/emu_window_sdl2_gl.cpp
@@ -24,42 +24,42 @@ add_executable(yuzu-cmd
precompiled_headers.h
sdl_config.cpp
sdl_config.h
- yuzu.cpp
- yuzu.rc
+ citron.cpp
+ citron.rc
)
-target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common)
-target_link_libraries(yuzu-cmd PRIVATE glad)
+target_link_libraries(citron-cmd PRIVATE common core input_common frontend_common)
+target_link_libraries(citron-cmd PRIVATE glad)
if (MSVC)
- target_link_libraries(yuzu-cmd PRIVATE getopt)
+ target_link_libraries(citron-cmd PRIVATE getopt)
endif()
-target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
+target_link_libraries(citron-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
-create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
-target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})
+create_resource("../../dist/citron.bmp" "citron_cmd/citron_icon.h" "citron_icon")
+target_include_directories(citron-cmd PRIVATE ${RESOURCES_DIR})
-target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
+target_link_libraries(citron-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
if(UNIX AND NOT APPLE)
- install(TARGETS yuzu-cmd)
+ install(TARGETS citron-cmd)
endif()
if(WIN32)
# compile as a win32 gui application instead of a console application
if(MSVC)
- set_target_properties(yuzu-cmd PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+ set_target_properties(citron-cmd PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
elseif(MINGW)
- set_target_properties(yuzu-cmd PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows")
+ set_target_properties(citron-cmd PROPERTIES LINK_FLAGS_RELEASE "-Wl,--subsystem,windows")
endif()
endif()
if (MSVC)
- include(CopyYuzuSDLDeps)
- copy_yuzu_SDL_deps(yuzu-cmd)
+ include(CopyCitronSDLDeps)
+ copy_citron_SDL_deps(citron-cmd)
endif()
-if (YUZU_USE_PRECOMPILED_HEADERS)
- target_precompile_headers(yuzu-cmd PRIVATE precompiled_headers.h)
+if (CITRON_USE_PRECOMPILED_HEADERS)
+ target_precompile_headers(citron-cmd PRIVATE precompiled_headers.h)
endif()
-create_target_directory_groups(yuzu-cmd)
+create_target_directory_groups(citron-cmd)
diff --git a/src/citron_cmd/citron.cpp b/src/citron_cmd/citron.cpp
index 8a8cdbc44..f728fb38f 100644
--- a/src/citron_cmd/citron.cpp
+++ b/src/citron_cmd/citron.cpp
@@ -35,10 +35,10 @@
#include "network/network.h"
#include "sdl_config.h"
#include "video_core/renderer_base.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2_gl.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2_null.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h"
+#include "citron_cmd/emu_window/emu_window_sdl2.h"
+#include "citron_cmd/emu_window/emu_window_sdl2_gl.h"
+#include "citron_cmd/emu_window/emu_window_sdl2_null.h"
+#include "citron_cmd/emu_window/emu_window_sdl2_vk.h"
#ifdef _WIN32
// windows.h needs to be included before shellapi.h
@@ -83,7 +83,7 @@ static void PrintHelp(const char* argv0) {
}
static void PrintVersion() {
- std::cout << "yuzu " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
+ std::cout << "citron " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
}
static void OnStateChanged(const Network::RoomMember::State& state) {
@@ -396,7 +396,7 @@ int main(int argc, char** argv) {
const u16 error_id = static_cast<u16>(load_result) - loader_id;
LOG_CRITICAL(Frontend,
"While attempting to load the ROM requested, an error occurred. Please "
- "refer to the yuzu wiki for more information or the yuzu discord for "
+ "refer to the citron wiki for more information or the citron discord for "
"additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));
}
diff --git a/src/citron_cmd/citron.rc b/src/citron_cmd/citron.rc
index e230cf680..02f292b54 100644
--- a/src/citron_cmd/citron.rc
+++ b/src/citron_cmd/citron.rc
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "winresrc.h"
@@ -9,7 +9,7 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-YUZU_ICON ICON "../../dist/yuzu.ico"
+CITRON_ICON ICON "../../dist/citron.ico"
/////////////////////////////////////////////////////////////////////////////
@@ -17,4 +17,4 @@ YUZU_ICON ICON "../../dist/yuzu.ico"
// RT_MANIFEST
//
-0 RT_MANIFEST "../../dist/yuzu.manifest"
+0 RT_MANIFEST "../../dist/citron.manifest"
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2.cpp b/src/citron_cmd/emu_window/emu_window_sdl2.cpp
index eae614f9d..9163d5707 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/citron_cmd/emu_window/emu_window_sdl2.cpp
@@ -13,8 +13,8 @@
#include "input_common/drivers/mouse.h"
#include "input_common/drivers/touch_screen.h"
#include "input_common/main.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
-#include "yuzu_cmd/yuzu_icon.h"
+#include "citron_cmd/emu_window/emu_window_sdl2.h"
+#include "citron_cmd/citron_icon.h"
EmuWindow_SDL2::EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_)
: input_subsystem{input_subsystem_}, system{system_} {
@@ -224,7 +224,7 @@ void EmuWindow_SDL2::WaitEvent() {
if (current_time > last_time + 2000) {
const auto results = system.GetAndResetPerfStats();
const auto title =
- fmt::format("yuzu {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname,
+ fmt::format("citron {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname,
Common::g_scm_branch, Common::g_scm_desc, results.average_game_fps,
results.emulation_speed * 100.0);
SDL_SetWindowTitle(render_window, title.c_str());
@@ -234,12 +234,12 @@ void EmuWindow_SDL2::WaitEvent() {
// Credits to Samantas5855 and others for this function.
void EmuWindow_SDL2::SetWindowIcon() {
- SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size);
- if (yuzu_icon_stream == nullptr) {
- LOG_WARNING(Frontend, "Failed to create yuzu icon stream.");
+ SDL_RWops* const citron_icon_stream = SDL_RWFromConstMem((void*)citron_icon, citron_icon_size);
+ if (citron_icon_stream == nullptr) {
+ LOG_WARNING(Frontend, "Failed to create citron icon stream.");
return;
}
- SDL_Surface* const window_icon = SDL_LoadBMP_RW(yuzu_icon_stream, 1);
+ SDL_Surface* const window_icon = SDL_LoadBMP_RW(citron_icon_stream, 1);
if (window_icon == nullptr) {
LOG_WARNING(Frontend, "Failed to read BMP from stream.");
return;
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2.h b/src/citron_cmd/emu_window/emu_window_sdl2.h
index 4ad05e0e1..71cfdc991 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2.h
+++ b/src/citron_cmd/emu_window/emu_window_sdl2.h
@@ -33,7 +33,7 @@ public:
/// Wait for the next event on the main thread.
void WaitEvent();
- // Sets the window icon from yuzu.bmp
+ // Sets the window icon from citron.bmp
void SetWindowIcon();
protected:
@@ -88,7 +88,7 @@ protected:
/// Input subsystem to use with this window.
InputCommon::InputSubsystem* input_subsystem;
- /// yuzu core instance
+ /// citron core instance
Core::System& system;
};
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp
index ddcb048d6..016d60836 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp
+++ b/src/citron_cmd/emu_window/emu_window_sdl2_gl.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <algorithm>
@@ -17,7 +17,7 @@
#include "core/core.h"
#include "input_common/main.h"
#include "video_core/renderer_base.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2_gl.h"
+#include "citron_cmd/emu_window/emu_window_sdl2_gl.h"
class SDLGLContext : public Core::Frontend::GraphicsContext {
public:
@@ -90,7 +90,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
}
SDL_GL_SetSwapInterval(0);
- std::string window_title = fmt::format("yuzu {} | {}-{}", Common::g_build_fullname,
+ std::string window_title = fmt::format("citron {} | {}-{}", Common::g_build_fullname,
Common::g_scm_branch, Common::g_scm_desc);
render_window =
SDL_CreateWindow(window_title.c_str(),
@@ -138,7 +138,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
OnResize();
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
SDL_PumpEvents();
- LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
+ LOG_INFO(Frontend, "citron Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
Common::g_scm_desc);
Settings::LogSettings();
}
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_gl.h b/src/citron_cmd/emu_window/emu_window_sdl2_gl.h
index 39346e704..c84eaf6cf 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2_gl.h
+++ b/src/citron_cmd/emu_window/emu_window_sdl2_gl.h
@@ -1,11 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include <memory>
#include "core/frontend/emu_window.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
+#include "citron_cmd/emu_window/emu_window_sdl2.h"
namespace Core {
class System;
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp
index 259192f3c..446419cb5 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp
+++ b/src/citron_cmd/emu_window/emu_window_sdl2_null.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <cstdlib>
@@ -10,9 +10,9 @@
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "video_core/renderer_null/renderer_null.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2_null.h"
+#include "citron_cmd/emu_window/emu_window_sdl2_null.h"
-#ifdef YUZU_USE_EXTERNAL_SDL2
+#ifdef CITRON_USE_EXTERNAL_SDL2
// Include this before SDL.h to prevent the external from including a dummy
#define USING_GENERATED_CONFIG_H
#include <SDL_config.h>
@@ -23,7 +23,7 @@
EmuWindow_SDL2_Null::EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subsystem_,
Core::System& system_, bool fullscreen)
: EmuWindow_SDL2{input_subsystem_, system_} {
- const std::string window_title = fmt::format("yuzu {} | {}-{} (Vulkan)", Common::g_build_name,
+ const std::string window_title = fmt::format("citron {} | {}-{} (Vulkan)", Common::g_build_name,
Common::g_scm_branch, Common::g_scm_desc);
render_window =
SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
@@ -40,7 +40,7 @@ EmuWindow_SDL2_Null::EmuWindow_SDL2_Null(InputCommon::InputSubsystem* input_subs
OnResize();
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
SDL_PumpEvents();
- LOG_INFO(Frontend, "yuzu Version: {} | {}-{} (Null)", Common::g_build_name,
+ LOG_INFO(Frontend, "citron Version: {} | {}-{} (Null)", Common::g_build_name,
Common::g_scm_branch, Common::g_scm_desc);
}
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_null.h b/src/citron_cmd/emu_window/emu_window_sdl2_null.h
index 35aee286d..2b9b6e412 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2_null.h
+++ b/src/citron_cmd/emu_window/emu_window_sdl2_null.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
@@ -6,7 +6,7 @@
#include <memory>
#include "core/frontend/emu_window.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
+#include "citron_cmd/emu_window/emu_window_sdl2.h"
namespace Core {
class System;
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp
index 8b916f05c..6e97a955f 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/citron_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <cstdlib>
@@ -10,7 +10,7 @@
#include "common/logging/log.h"
#include "common/scm_rev.h"
#include "video_core/renderer_vulkan/renderer_vulkan.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h"
+#include "citron_cmd/emu_window/emu_window_sdl2_vk.h"
#include <SDL.h>
#include <SDL_syswm.h>
@@ -18,7 +18,7 @@
EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_,
Core::System& system_, bool fullscreen)
: EmuWindow_SDL2{input_subsystem_, system_} {
- const std::string window_title = fmt::format("yuzu {} | {}-{} (Vulkan)", Common::g_build_name,
+ const std::string window_title = fmt::format("citron {} | {}-{} (Vulkan)", Common::g_build_name,
Common::g_scm_branch, Common::g_scm_desc);
render_window =
SDL_CreateWindow(window_title.c_str(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
@@ -82,7 +82,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
OnResize();
OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
SDL_PumpEvents();
- LOG_INFO(Frontend, "yuzu Version: {} | {}-{} (Vulkan)", Common::g_build_name,
+ LOG_INFO(Frontend, "citron Version: {} | {}-{} (Vulkan)", Common::g_build_name,
Common::g_scm_branch, Common::g_scm_desc);
}
diff --git a/src/citron_cmd/emu_window/emu_window_sdl2_vk.h b/src/citron_cmd/emu_window/emu_window_sdl2_vk.h
index 9467d164a..cd110b276 100644
--- a/src/citron_cmd/emu_window/emu_window_sdl2_vk.h
+++ b/src/citron_cmd/emu_window/emu_window_sdl2_vk.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
@@ -6,7 +6,7 @@
#include <memory>
#include "core/frontend/emu_window.h"
-#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
+#include "citron_cmd/emu_window/emu_window_sdl2.h"
namespace Core {
class System;
diff --git a/src/citron_cmd/precompiled_headers.h b/src/citron_cmd/precompiled_headers.h
index aabae730b..87b2e790e 100644
--- a/src/citron_cmd/precompiled_headers.h
+++ b/src/citron_cmd/precompiled_headers.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/src/citron_cmd/sdl_config.cpp b/src/citron_cmd/sdl_config.cpp
index 6e0f254b6..ef22813f4 100644
--- a/src/citron_cmd/sdl_config.cpp
+++ b/src/citron_cmd/sdl_config.cpp
@@ -1,7 +1,7 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
-// SDL will break our main function in yuzu-cmd if we don't define this before adding SDL.h
+// SDL will break our main function in citron-cmd if we don't define this before adding SDL.h
#define SDL_MAIN_HANDLED
#include <SDL.h>
diff --git a/src/citron_cmd/sdl_config.h b/src/citron_cmd/sdl_config.h
index 1fd1c692d..ec670e09f 100644
--- a/src/citron_cmd/sdl_config.h
+++ b/src/citron_cmd/sdl_config.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2025 citron Homebrew Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 13:09:28 +0000