aboutsummaryrefslogtreecommitdiff
path: root/src/yuzu
diff options
context:
space:
mode:
authorcrueter <crueter@eden-emu.dev>2025-09-20 22:58:33 +0200
committercrueter <crueter@eden-emu.dev>2025-09-20 22:58:33 +0200
commit06dabbadcbdb7291d9e238da46b81eb0b7fc1e83 (patch)
tree12663433f06e4432b4ffa2ec3ed6ad60bf11ec1b /src/yuzu
parent8c9cdf0d70eebd92933f7120c36069fec996f85d (diff)
[cmake] fix OpenGL, git rev identifier (#2530)
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2530 Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to 'src/yuzu')
-rw-r--r--src/yuzu/CMakeLists.txt4
-rw-r--r--src/yuzu/about_dialog.cpp16
-rw-r--r--src/yuzu/main.cpp13
3 files changed, 11 insertions, 22 deletions
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 8a1d760c50..b16c1d99ce 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -480,10 +480,6 @@ if (MSVC)
copy_yuzu_FFmpeg_deps(yuzu)
endif()
-if (NOT APPLE AND ENABLE_OPENGL)
- target_compile_definitions(yuzu PRIVATE HAS_OPENGL)
-endif()
-
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
target_link_libraries(yuzu PRIVATE dynarmic::dynarmic)
endif()
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp
index c8edb90268..b7c0cd58d5 100644
--- a/src/yuzu/about_dialog.cpp
+++ b/src/yuzu/about_dialog.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@@ -11,16 +14,11 @@ AboutDialog::AboutDialog(QWidget* parent)
: QDialog(parent)
, ui{std::make_unique<Ui::AboutDialog>()}
{
- static const std::string description = std::string(Common::g_build_version);
- static const std::string build_id = std::string(Common::g_build_id);
- static const std::string compiler = std::string(Common::g_compiler_id);
+ static const std::string description = std::string{Common::g_build_version};
+ static const std::string build_id = std::string{Common::g_build_id};
+ static const std::string compiler = std::string{Common::g_compiler_id};
- std::string yuzu_build;
- if (Common::g_is_dev_build) {
- yuzu_build = fmt::format("Eden Nightly | {}-{} | {}", description, build_id, compiler);
- } else {
- yuzu_build = fmt::format("Eden | {} | {}", description, compiler);
- }
+ static const std::string yuzu_build = fmt::format("Eden | {} | {}", description, compiler);
const auto override_build = fmt::format(fmt::runtime(
std::string(Common::g_title_bar_format_idle)),
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index d7d4e94ab7..19162a4ab7 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -4205,16 +4205,11 @@ void GMainWindow::OnEmulatorUpdateAvailable() {
void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_view title_version,
std::string_view gpu_vendor) {
- static const std::string description = std::string(Common::g_build_version);
- static const std::string build_id = std::string(Common::g_build_id);
- static const std::string compiler = std::string(Common::g_compiler_id);
+ static const std::string description = std::string{Common::g_build_version};
+ static const std::string build_id = std::string{Common::g_build_id};
+ static const std::string compiler = std::string{Common::g_compiler_id};
- std::string yuzu_title;
- if (Common::g_is_dev_build) {
- yuzu_title = fmt::format("Eden Nightly | {}-{} | {}", description, build_id, compiler);
- } else {
- yuzu_title = fmt::format("Eden | {} | {}", description, compiler);
- }
+ static const std::string yuzu_title = fmt::format("Eden | {} | {}", description, compiler);
const auto override_title =
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);