From 40e2d8b9cf270ea632e716d6b58b77b8ee0813e2 Mon Sep 17 00:00:00 2001
From: georgemoralis <giorgosmrls@gmail.com>
Date: Sat, 13 Apr 2024 10:48:18 +0300
Subject: [PATCH] fixed sdl3 under qt

---
 CMakeLists.txt           | 16 +++++++---------
 externals/CMakeLists.txt |  2 --
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce0963827..f94e3ff78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,12 +14,6 @@ project(shadps4)
 
 option(ENABLE_QT_GUI "Enable the Qt GUI. If not selected then the emulator uses a minimal SDL-based UI instead" OFF)
 
-if(ENABLE_QT_GUI)
-    find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)
-    qt_standard_project_setup()
-    set(CMAKE_AUTORCC ON)
-endif()
-
 # This function should be passed a list of all files in a target. It will automatically generate
 # file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
 # one in the filesystem.
@@ -93,6 +87,12 @@ add_subdirectory(externals)
 add_subdirectory(third-party)
 include_directories(src)
 
+if(ENABLE_QT_GUI)
+    find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)
+    qt_standard_project_setup()
+    set(CMAKE_AUTORCC ON)
+endif()
+
 set(AUDIO_CORE src/audio_core/sdl_audio.cpp 
                src/audio_core/sdl_audio.h
 )
@@ -331,7 +331,7 @@ endif()
 
 create_target_directory_groups(shadps4)
 
-target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11)
+target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 SDL3-shared)
 target_link_libraries(shadps4 PRIVATE discord-rpc vulkan-1 xxhash Zydis)
 
 if(NOT ENABLE_QT_GUI)
@@ -374,12 +374,10 @@ add_custom_command(TARGET shadps4 POST_BUILD
      $<TARGET_FILE_DIR:shadps4>
 )
 
-if(NOT ENABLE_QT_GUI)
 add_custom_command(TARGET shadps4 POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
      $<TARGET_FILE:SDL3-shared>
      $<TARGET_FILE_DIR:shadps4>)
-endif()
 
 if (WIN32)
  add_custom_command(TARGET shadps4 POST_BUILD
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index f70298fd7..2eec19984 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -33,7 +33,5 @@ set(WITH_NEW_STRATEGIES ON)
 set(WITH_NATIVE_INSTRUCTIONS ON)
 add_subdirectory(zlib-ng)
 
-if(NOT ENABLE_QT_GUI)
 # SDL3
 add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
-endif()