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

More Cmake code review

Browse Source
This commit is contained in:
Chuck Walbourn 2019-12-11 16:19:23 -08:00
parent 1f77e40045
commit d284ff54b6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -112,5 +112,10 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
target_compile_options(texdiag PRIVATE ${WarningsEXE}) target_compile_options(texdiag PRIVATE ${WarningsEXE})
endif() endif()
# Windows 10 is used here to build the DirectX 12 code paths as well as 11 if(WIN32)
add_compile_definitions(_UNICODE UNICODE _WIN32_WINNT=0x0A00) # Windows 10 is used here to build the DirectX 12 code paths as well as 11
target_compile_definitions(${PROJECT_NAME} PRIVATE _UNICODE UNICODE _WIN32_WINNT=0x0A00)
target_compile_definitions(texassemble PRIVATE _UNICODE UNICODE _WIN32_WINNT=0x0A00)
target_compile_definitions(texconv PRIVATE _UNICODE UNICODE _WIN32_WINNT=0x0A00)
target_compile_definitions(texdiag PRIVATE _UNICODE UNICODE _WIN32_WINNT=0x0A00)
endif()

4
DirectXTex/DirectXTex.h
View File

@ -17,7 +17,7 @@
#include <functional> #include <functional>
#include <vector> #include <vector>
#if !defined(__d3d11_h__) && !defined(__d3d11_x_h__) && !defined(__d3d12_h__) && !defined(__d3d12_x_h__) #if !defined(__d3d11_h__) && !defined(__d3d11_x_h__) && !defined(__d3d12_h__) && !defined(__d3d12_x_h__) && !defined(__XBOX_D3D12_X__)
#if defined(_XBOX_ONE) && defined(_TITLE) #if defined(_XBOX_ONE) && defined(_TITLE)
#include <d3d11_x.h> #include <d3d11_x.h>
#else #else
@ -754,7 +754,7 @@ namespace DirectX
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
// Direct3D 12 functions // Direct3D 12 functions
#if defined(__d3d12_h__) || defined(__d3d12_x_h__) #if defined(__d3d12_h__) || defined(__d3d12_x_h__) || defined(__XBOX_D3D12_X__)
bool __cdecl IsSupportedTexture(_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata); bool __cdecl IsSupportedTexture(_In_ ID3D12Device* pDevice, _In_ const TexMetadata& metadata);
HRESULT __cdecl CreateTexture( HRESULT __cdecl CreateTexture(