mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-10-09 06:46:57 +00:00
[desktop] More qt_common reorganization (#3916)
Ported from QML branch. Main "big" change is that EmuThread is now a shared state in QtCommon, not individually managed/passed around by GRenderWindow and MainWindow. Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3916 Reviewed-by: Lizzie <lizzie@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>
This commit is contained in:
@@ -26,6 +26,7 @@ add_library(qt_common STATIC
|
||||
util/compress.h util/compress.cpp
|
||||
util/fs.h util/fs.cpp
|
||||
util/mod.h util/mod.cpp
|
||||
util/vk.h util/vk.cpp
|
||||
|
||||
abstract/frontend.h abstract/frontend.cpp
|
||||
abstract/progress.h abstract/progress.cpp
|
||||
@@ -33,7 +34,9 @@ add_library(qt_common STATIC
|
||||
qt_string_lookup.h
|
||||
qt_compat.h
|
||||
|
||||
discord/discord.h)
|
||||
discord/discord.h
|
||||
render/context.h
|
||||
render/emu_thread.h render/emu_thread.cpp)
|
||||
|
||||
if (UNIX)
|
||||
target_sources(qt_common PRIVATE gui_settings.cpp gui_settings.h)
|
||||
@@ -56,9 +59,7 @@ if (USE_DISCORD_PRESENCE)
|
||||
endif()
|
||||
|
||||
# TODO(crueter)
|
||||
if (ENABLE_QT)
|
||||
target_link_libraries(qt_common PRIVATE Qt6::Widgets)
|
||||
endif()
|
||||
target_link_libraries(qt_common PRIVATE Qt6::Widgets)
|
||||
|
||||
target_compile_definitions(qt_common PUBLIC
|
||||
# Use QStringBuilder for string concatenation to reduce
|
||||
@@ -80,7 +81,7 @@ target_compile_definitions(qt_common PUBLIC
|
||||
)
|
||||
|
||||
target_link_libraries(qt_common PRIVATE core Qt6::Core Qt6::Concurrent SimpleIni::SimpleIni QuaZip::QuaZip)
|
||||
target_link_libraries(qt_common PUBLIC frozen::frozen-headers)
|
||||
target_link_libraries(qt_common PUBLIC frozen::frozen-headers Vulkan::Headers)
|
||||
target_link_libraries(qt_common PRIVATE gamemode::headers frontend_common)
|
||||
|
||||
if (ENABLE_OPENGL)
|
||||
|
||||
Reference in New Issue
Block a user