Link ImGui

This commit is contained in:
SimoneN64
2024-09-18 20:41:48 +02:00
parent 96ab593d6f
commit aeb73a8bbb
5 changed files with 83 additions and 34 deletions

View File

@@ -53,6 +53,7 @@ add_subdirectory(../backend backend)
add_subdirectory(../../external/parallel-rdp parallel-rdp)
add_subdirectory(../../external/unarr unarr)
add_subdirectory(../../external/SDL SDL)
add_subdirectory(../../external/imgui imgui)
set(CMAKE_AUTOMOC ON)
@@ -95,7 +96,7 @@ if (${CMAKE_BUILD_TYPE} MATCHES Debug)
#target_link_options(kaizen-qt PUBLIC -fsanitize=address -fsanitize=undefined)
endif ()
target_link_libraries(kaizen-qt PUBLIC SDL3::SDL3 SDL3::SDL3-static Qt6::Core Qt6::Gui Qt6::Widgets discord-rpc fmt mio nlohmann_json parallel-rdp backend)
target_link_libraries(kaizen-qt PUBLIC SDL3::SDL3 SDL3::SDL3-static Qt6::Core Qt6::Gui Qt6::Widgets discord-rpc fmt mio nlohmann_json imgui parallel-rdp backend)
target_compile_definitions(kaizen-qt PUBLIC SDL_MAIN_HANDLED)
file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/)

View File

@@ -7,7 +7,8 @@ EmuThread::EmuThread(const std::shared_ptr<QtInstanceFactory> &instance_,
instance(instance_), wsiPlatform(wsiPlatform_), windowInfo(windowInfo_), core(parallel), settings(settings) {}
[[noreturn]] void EmuThread::run() noexcept {
parallel.Init(instance, wsiPlatform, windowInfo, core.cpu->GetMem().GetRDRAMPtr());
parallel.Init(instance, wsiPlatform, windowInfo, core.cpu->GetMem().GetRDRAMPtr(),
reinterpret_cast<void *>(wsiPlatform->get_native_window()));
SDL_InitSubSystem(SDL_INIT_GAMEPAD);
bool controllerConnected = false;

View File

@@ -81,7 +81,6 @@ public:
VkApplicationInfo appInfo{.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .apiVersion = VK_API_VERSION_1_3};
private:
QWindow *window;
};