Skip to content

Commit 03f2206

Browse files
committed
Handle empty GameDKXboxLatest
1 parent 0453f29 commit 03f2206

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,6 @@ jobs:
295295
parameters:
296296
windows: false
297297
scarlett: true
298-
- task: PowerShell@2
299-
displayName: 'NuGet Install GDK'
300-
inputs:
301-
targetType: filePath
302-
filePath: ./build/RestoreGDK.ps1
303-
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
304-
failOnStderr: true
305298
- task: CmdLine@2
306299
displayName: Setup BWOI for GDK command-line
307300
inputs:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ if(DEFINED XBOX_CONSOLE_TARGET)
142142
endif()
143143

144144
elseif((BUILD_XBOX_EXTS_XBOXONE OR BUILD_XBOX_EXTS_SCARLETT) AND WIN32)
145-
if(DEFINED ENV{GameDKXboxLatest})
145+
if((DEFINED ENV{GameDKXboxLatest}) AND (NOT ("$ENV{GameDKXboxLatest}" STREQUAL "")))
146146
cmake_path(SET GameDK_DIR "$ENV{GameDKXboxLatest}")
147147
elseif(DEFINED ENV{GameDKLatest})
148148
cmake_path(SET GameDK_DIR "$ENV{GameDKLatest}")

0 commit comments

Comments
 (0)