File tree Expand file tree Collapse file tree 4 files changed +12
-9
lines changed Expand file tree Collapse file tree 4 files changed +12
-9
lines changed Original file line number Diff line number Diff line change @@ -10,15 +10,13 @@ parameters:
1010 default : " "
1111 - name : sourceDir
1212 type : string
13- default : " $(System.DefaultWorkingDirectory )"
13+ default : " $(Pipeline.Workspace )"
1414 - name : buildDir
1515 type : string
16- default : build
16+ default : " $(Build.BinariesDirectory) "
1717
1818steps :
19- - checkout : self
20- lfs : true
21- - script : " rm -rf ${{ parameters.sourceDir }}/${{ parameters.buildDir }}"
19+ - script : " rm -rf ${{ parameters.buildDir }}"
2220 displayName : " Clean up build directory"
2321
2422 - script : " cmake -G Ninja -S . -B ${{ parameters.buildDir }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}"
Original file line number Diff line number Diff line change 1+ 1
Original file line number Diff line number Diff line change 1+ Loader: Fix loader build on Universal Windows Platform: build-system-only change. (Included in SDK hotfix 1.0.32.1.)
Original file line number Diff line number Diff line change @@ -205,17 +205,20 @@ elseif(WIN32)
205205 )
206206
207207 if (MSVC )
208+ if (DYNAMIC_LOADER)
209+ target_sources (
210+ openxr_loader
211+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR} /openxr-loader.def"
212+ )
213+ endif ()
214+
208215 if (DYNAMIC_LOADER AND NOT (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" ))
209216 # If building DLLs, force static CRT linkage
210217 set_target_properties (
211218 openxr_loader
212219 PROPERTIES MSVC_RUNTIME_LIBRARY
213220 "MultiThreaded$<$<CONFIG:Debug>:Debug>"
214221 )
215- target_sources (
216- openxr_loader
217- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR} /openxr-loader.def"
218- )
219222 else ()
220223 # WindowsStore (UWP) apps must be compiled with dynamic CRT linkage (default)
221224 # Otherwise for static libs, link the CRT dynamically
You can’t perform that action at this time.
0 commit comments