From a38d3f044f3e07f485ef1d542632de9a40da4e21 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Sun, 26 Mar 2023 22:55:41 +0100 Subject: [PATCH] [cmake] Add dx12.hdll to build --- libs/CMakeLists.txt | 5 +-- libs/directx/CMakeLists.txt | 75 +++++++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 28 deletions(-) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 551565bb2..904fec741 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -10,10 +10,7 @@ function(set_as_hdll target) endfunction() if(WIN32) - option(WITH_DIRECTX "Build directx.hdll." ON) - if(WITH_DIRECTX) - add_subdirectory(directx) - endif() + add_subdirectory(directx) endif() option(WITH_FMT "Build fmt.hdll." ON) diff --git a/libs/directx/CMakeLists.txt b/libs/directx/CMakeLists.txt index d1c45ee6a..0d7aba011 100644 --- a/libs/directx/CMakeLists.txt +++ b/libs/directx/CMakeLists.txt @@ -1,24 +1,51 @@ -find_package(DirectX) - -add_library(directx.hdll SHARED - directx.cpp - gamecontroller.c - window.c -) - -set_as_hdll(directx) - -target_link_libraries(directx.hdll - libhl - d3d11 - dxgi - d3dcompiler - xinput9_1_0 - dinput8 -) - -install( - TARGETS - directx.hdll - DESTINATION ${HDLL_DESTINATION} -) +option(WITH_DIRECTX "Build directx.hdll." ON) + +if(WITH_DIRECTX) + find_package(DirectX) + + add_library(directx.hdll SHARED + directx.cpp + gamecontroller.c + window.c + ) + + set_as_hdll(directx) + + target_link_libraries(directx.hdll + libhl + d3d11 + dxgi + d3dcompiler + xinput9_1_0 + dinput8 + ) + + install( + TARGETS + directx.hdll + DESTINATION ${HDLL_DESTINATION} + ) +endif() + +option(WITH_DX12 "Build dx12.hdll." ON) + +if(WITH_DX12) + add_library(dx12.hdll SHARED + dx12.cpp + ) + + set_as_hdll(dx12) + + target_link_libraries(dx12.hdll + libhl + d3d12 + dxgi + dxcompiler + ) + + install( + TARGETS + dx12.hdll + DESTINATION ${HDLL_DESTINATION} + ) +endif()