Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-25 03:08:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[compat] Solaris build fixes for openssl, catch2; NetBSD build fixes (#2752)

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2752
Reviewed-by: Shinmegumi <shinmegumi@eden-emu.dev>
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-10-17 22:12:58 +02:00 • committed by crueter
parent 1c90b099d3
commit 3e8fe622a7
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
22 changed files with 247 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/qt_common/CMakeLists.txt
View file

@ -76,9 +76,9 @@ if (NOT APPLE AND ENABLE_OPENGL)
endif()
if (UNIX AND NOT APPLE)
if (TARGET Qt6::GuiPrivate)
target_link_libraries(qt_common PRIVATE Qt6::GuiPrivate)
else()
if (DEFINED Qt6Gui_PRIVATE_INCLUDE_DIRS)
target_include_directories(qt_common PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
else()
target_link_libraries(qt_common PRIVATE Qt6::GuiPrivate)
endif()
endif()

1
src/qt_common/util/content.cpp
View file

@ -501,7 +501,6 @@ void ImportDataDir(FrontendCommon::DataManager::DataDir data_dir,
auto progress_callback = [=](size_t total_size, size_t processed_size) {
QMetaObject::invokeMethod(progress, "setValue", Qt::DirectConnection,
Q_ARG(int, static_cast<int>((processed_size * 100) / total_size)));
return !progress->wasCanceled();
};

3
src/qt_common/util/game.cpp
View file

@ -542,7 +542,8 @@ void CreateShortcut(const std::string& game_path,
qgame_title);
}
constexpr std::string GetShortcutPath(ShortcutTarget target) {
// TODO: You want this to be constexpr? Well too bad, clang19 doesn't believe this is a string literal
std::string GetShortcutPath(ShortcutTarget target) {
{
std::string shortcut_path{};
if (target == ShortcutTarget::Desktop) {

2
src/qt_common/util/game.h
View file

@ -78,7 +78,7 @@ void CreateShortcut(const std::string& game_path,
std::string arguments_,
const bool needs_title);
constexpr std::string GetShortcutPath(ShortcutTarget target);
std::string GetShortcutPath(ShortcutTarget target);
void CreateHomeMenuShortcut(ShortcutTarget target);
}