Merge d7a38247a3 into 9ace79a4d2

CMakeLists.txt

@@ -23,6 +23,10 @@ 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(UNLEASHED_RECOMP_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES})
 elseif(CMAKE_SYSTEM_PROCESSOR)

UnleashedRecomp/CMakeLists.txt

@@ -352,13 +352,23 @@ if (UNLEASHED_RECOMP_FLATPAK)
     )
 endif()
 
-find_package(CURL REQUIRED)
-
 if (UNLEASHED_RECOMP_D3D12)
     find_package(directx-headers CONFIG REQUIRED)
     find_package(directx12-agility CONFIG REQUIRED)
-    target_compile_definitions(UnleashedRecomp PRIVATE UNLEASHED_RECOMP_D3D12)
+    target_compile_definitions(UnleashedRecomp PRIVATE 
+        UNLEASHED_RECOMP_D3D12
+        D3D12MA_USING_DIRECTX_HEADERS
+        D3D12MA_OPTIONS16_SUPPORTED
+    )
+endif()
 
+if (SDL_VULKAN_ENABLED)
+    target_compile_definitions(UnleashedRecomp PRIVATE SDL_VULKAN_ENABLED)
+endif()
+
+find_package(CURL REQUIRED)
+
+if (UNLEASHED_RECOMP_D3D12)
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12)
     add_custom_command(TARGET UnleashedRecomp POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:Microsoft::DirectX12-Core,IMPORTED_LOCATION_RELEASE> $<TARGET_FILE_DIR:UnleashedRecomp>/D3D12
@@ -369,6 +379,9 @@ if (UNLEASHED_RECOMP_D3D12)
     )
 
     target_link_libraries(UnleashedRecomp PRIVATE
+        Microsoft::DirectX-Headers 
+        Microsoft::DirectX-Guids 
+        Microsoft::DirectX12-Agility
         Microsoft::DirectXShaderCompiler
         Microsoft::DXIL
         dxgi
@@ -382,7 +395,7 @@ if (WIN32)
         ntdll
         Shcore
         Synchronization
-        winmm
+        winmm
         windowsapp
     )
 endif()

thirdparty/CMakeLists.txt

@@ -15,14 +15,6 @@ 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()
-
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/msdf-atlas-gen")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/o1heap")

thirdparty/plume

@@ -1 +1 @@
-Subproject commit 11926860e878e68626ea99ec88562ce2b8badc4f
+Subproject commit fffeb35f836d8c945697ec82b735e77db401e2de