Compare commits

..

14 commits

Author SHA1 Message Date
d111dcecd0
Fix license headers
All checks were successful
eden-license / license-header (pull_request) Successful in 30s
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
bd67d58daa
[qt_common] reorg, move more stuff out of main
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
10be04b484
[qt_common] update translations
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
c75d98653d
Fix license headers 2025-08-30 19:51:01 -04:00
02860a7a47
[qt] frontend abstraction and message box early handling
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
f4e7e759b7
thank you Qt Creator, very cool
Signed-off-by: crueter <crueter@crueter.xyz>
2025-08-30 19:51:01 -04:00
15868da546
Fix license headers 2025-08-30 19:51:01 -04:00
b1b338d9ae
more common funcs
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
d03ce976b2
explicitly check write status for dir
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
287477cd18
debug: log user/save id
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
a7bc191afe
Fix license headers
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
463cb7217b
move fw install
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
52cf4564ab
qt_common init
Signed-off-by: crueter <crueter@eden-emu.dev>
2025-08-30 19:51:01 -04:00
1c3ca17cfb
[dynarmic] fix annoying gcc/clang error (#365)
caused qt creator to crash somehow geg

Signed-off-by: crueter <crueter@eden-emu.dev>

Reviewed-on: #365
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@outlook.com>
2025-08-31 00:12:06 +02:00
2 changed files with 20 additions and 40 deletions

View file

@ -1,40 +0,0 @@
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 54c852f831..ff35c8dc2c 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -63,20 +63,22 @@ if (NOT WIN32 AND NOT ANDROID)
set(FFmpeg_HWACCEL_INCLUDE_DIRS)
set(FFmpeg_HWACCEL_LDFLAGS)
- # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
- if(PLATFORM_SUN)
- list(APPEND FFmpeg_HWACCEL_LIBRARIES
- X11
- "/usr/lib/xorg/amd64/libdrm.so")
- else()
- pkg_check_modules(LIBDRM libdrm REQUIRED)
- list(APPEND FFmpeg_HWACCEL_LIBRARIES
- ${LIBDRM_LIBRARIES})
- list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
- ${LIBDRM_INCLUDE_DIRS})
+ if (NOT APPLE)
+ # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
+ if(PLATFORM_SUN)
+ list(APPEND FFmpeg_HWACCEL_LIBRARIES
+ X11
+ "/usr/lib/xorg/amd64/libdrm.so")
+ else()
+ pkg_check_modules(LIBDRM libdrm REQUIRED)
+ list(APPEND FFmpeg_HWACCEL_LIBRARIES
+ ${LIBDRM_LIBRARIES})
+ list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
+ ${LIBDRM_INCLUDE_DIRS})
+ endif()
+ list(APPEND FFmpeg_HWACCEL_FLAGS
+ --enable-libdrm)
endif()
- list(APPEND FFmpeg_HWACCEL_FLAGS
- --enable-libdrm)
if(LIBVA_FOUND)
find_package(X11 REQUIRED)

View file

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
/* This file is part of the dynarmic project.
* Copyright (c) 2018 MerryMage
* SPDX-License-Identifier: 0BSD
@ -19,6 +22,16 @@
namespace Dynarmic::Common {
// prevents this function from printing 56,000 character warning messages
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wno-stack-usage"
#endif
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wno-stack-usage"
#endif
template<typename Function, typename... Values>
inline auto GenerateLookupTableFromList(Function f, mcl::mp::list<Values...>) {
#ifdef _MSC_VER
@ -34,4 +47,11 @@ inline auto GenerateLookupTableFromList(Function f, mcl::mp::list<Values...>) {
return MapT(pair_array.begin(), pair_array.end());
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#ifdef __clang__
#pragma clang diagnostic pop
#endif
} // namespace Dynarmic::Common