Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-12 21:20:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use DirectX-Headers via vcpkg

Browse Source
This commit is contained in:
Chuck Walbourn 2021-05-11 22:42:41 -07:00
parent 1ab21d9900
commit be1050bce2
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -144,6 +144,7 @@ if ((NOT WIN32) OR VCPKG_TOOLCHAIN)
find_package(directx-headers CONFIG REQUIRED) find_package(directx-headers CONFIG REQUIRED)
find_package(directxmath CONFIG REQUIRED) find_package(directxmath CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers Microsoft::DirectXMath) target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers Microsoft::DirectXMath)
target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS)
endif() endif()
#--- Package #--- Package

2
DirectXTex/DirectXTex.h
View File

@ -29,7 +29,7 @@
#include <d3d11_1.h> #include <d3d11_1.h>
#endif #endif
#endif #endif
#else #else // !WIN32
#include <directx/dxgiformat.h> #include <directx/dxgiformat.h>
#include <wsl/winadapter.h> #include <wsl/winadapter.h>
#endif #endif

5
DirectXTex/DirectXTexP.h
View File

@ -100,7 +100,12 @@
#include <d3d12_x.h> #include <d3d12_x.h>
#include <d3d11_x.h> #include <d3d11_x.h>
#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN10) #elif (_WIN32_WINNT >= _WIN32_WINNT_WIN10)
#ifdef USING_DIRECTX_HEADERS
#include <directx/dxgiformat.h>
#include <directx/d3d12.h>
#else
#include <d3d12.h> #include <d3d12.h>
#endif
#include <d3d11_4.h> #include <d3d11_4.h>
#else #else
#include <d3d11_1.h> #include <d3d11_1.h>