Skip to content

Commit 8648353

Browse files
committed
Minor CMake code review
1 parent 8d81eff commit 8648353

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

CMakeLists.txt

+11-10
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,17 @@ elseif((BUILD_XBOX_EXTS_XBOXONE OR BUILD_XBOX_EXTS_SCARLETT) AND WIN32)
143143
Auxiliary/DirectXTexXboxTile.cpp)
144144
endif()
145145

146-
set(SHADER_SOURCES
147-
DirectXTex/Shaders/BC6HEncode.hlsl
148-
DirectXTex/Shaders/BC7Encode.hlsl)
149146

150-
if(BUILD_DX11 AND WIN32)
151-
list(APPEND LIBRARY_SOURCES
152-
DirectXTex/BCDirectCompute.h
153-
DirectXTex/BCDirectCompute.cpp
154-
DirectXTex/DirectXTexCompressGPU.cpp
155-
DirectXTex/DirectXTexD3D11.cpp)
147+
if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
148+
set(SHADER_SOURCES
149+
DirectXTex/Shaders/BC6HEncode.hlsl
150+
DirectXTex/Shaders/BC7Encode.hlsl)
151+
152+
list(APPEND LIBRARY_SOURCES
153+
DirectXTex/BCDirectCompute.h
154+
DirectXTex/BCDirectCompute.cpp
155+
DirectXTex/DirectXTexCompressGPU.cpp
156+
DirectXTex/DirectXTexD3D11.cpp)
156157
endif()
157158

158159
if(BUILD_DX12)
@@ -184,7 +185,7 @@ if(ENABLE_LIBPNG_SUPPORT)
184185
list(APPEND LIBRARY_SOURCES Auxiliary/DirectXTexPNG.cpp)
185186
endif()
186187

187-
if(BUILD_DX11 AND WIN32)
188+
if(BUILD_DX11 AND WIN32 AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
188189
if(NOT COMPILED_SHADERS)
189190
if(USE_PREBUILT_SHADERS)
190191
message(FATAL_ERROR "ERROR: Using prebuilt shaders requires the COMPILED_SHADERS variable is set")

0 commit comments

Comments
 (0)