Update plume to latest upstream (#68)

Author: squidbus

CMakeLists.txt

@@ -23,10 +23,6 @@ if (APPLE)
     enable_language(OBJC OBJCXX)
 endif()
 
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    set(SDL_VULKAN_ENABLED ON CACHE BOOL "")
-endif()
-
 if (CMAKE_OSX_ARCHITECTURES)
     set(MARATHON_RECOMP_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES})
 elseif(CMAKE_SYSTEM_PROCESSOR)

MarathonRecomp/CMakeLists.txt

@@ -139,7 +139,7 @@ set(MARATHON_RECOMP_PATCHES_CXX_SOURCES
     "patches/audio_patches.cpp"
     "patches/camera_patches.cpp"
     "patches/frontend_listener.cpp"
-    "patches/misc_patches.cpp"
+    "patches/misc_patches.cpp"
     "patches/player_patches.cpp"
     "patches/TitleTask_patches.cpp"
     "patches/video_patches.cpp"
@@ -357,23 +357,17 @@ if (MARATHON_RECOMP_FLATPAK)
     )
 endif()
 
-if (MARATHON_RECOMP_D3D12)
-    find_package(directx-headers CONFIG REQUIRED)
-    find_package(directx12-agility CONFIG REQUIRED)
-    target_compile_definitions(MarathonRecomp PRIVATE MARATHON_RECOMP_D3D12)
-endif()
+find_package(CURL REQUIRED)
 
 if (MARATHON_RECOMP_METAL)
     target_compile_definitions(MarathonRecomp PRIVATE MARATHON_RECOMP_METAL)
 endif()
 
-if (SDL_VULKAN_ENABLED)
-    target_compile_definitions(MarathonRecomp PRIVATE SDL_VULKAN_ENABLED)
-endif()
-
-find_package(CURL REQUIRED)
-
 if (MARATHON_RECOMP_D3D12)
+    find_package(directx-headers CONFIG REQUIRED)
+    find_package(directx12-agility CONFIG REQUIRED)
+    target_compile_definitions(MarathonRecomp PRIVATE MARATHON_RECOMP_D3D12)
+
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12)
     add_custom_command(TARGET MarathonRecomp POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Core,IMPORTED_LOCATION_RELEASE> $<TARGET_FILE_DIR:MarathonRecomp>/D3D12
@@ -384,9 +378,6 @@ if (MARATHON_RECOMP_D3D12)
     )
 
     target_link_libraries(MarathonRecomp PRIVATE
-            Microsoft::DirectX-Headers
-            Microsoft::DirectX-Guids
-            Microsoft::DirectX12-Agility
             Microsoft::DirectXShaderCompiler
             Microsoft::DXIL
             dxgi

thirdparty/CMakeLists.txt

@@ -15,6 +15,14 @@ set(SDL2MIXER_OPUS OFF)
 set(SDL2MIXER_VORBIS "VORBISFILE")
 set(SDL2MIXER_WAVPACK OFF)
 
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(SDL_VULKAN_ENABLED ON CACHE BOOL "")
+endif()
+
+if (WIN32)
+    set(D3D12_AGILITY_SDK_ENABLED ON CACHE BOOL "")
+endif()
+
 if (APPLE AND CMAKE_OSX_ARCHITECTURES)
     set(BASE_ARCHITECTURE "${CMAKE_OSX_ARCHITECTURES}")
 elseif (CMAKE_SYSTEM_PROCESSOR)