Compatibility with root disk drives

pal1000 · Jul 29, 2024 · ead5b4e · ead5b4e
1 parent 0f75a44
commit ead5b4e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -24,7 +24,7 @@ jobs:
           git clone --depth=1 https://swiftshader.googlesource.com/SwiftShader swiftshader
           git clone https://github.com/pal1000/swiftshader-dist-win.git swiftshader-dist-win
           cd swiftshader-dist-win
-          git checkout 1.0.7.2
+          git checkout 1.0.7.3
           cd ..
         displayName: Get sources
       - script: swiftshader-dist-win\buildscript\ci\ci.cmd collectuids

diff --git a/buildscript/build.cmd b/buildscript/build.cmd
@@ -5,6 +5,7 @@
 @cd "%~dp0"
 @cd ..\..\
 @for %%a in ("%cd%") do @set devroot=%%~sa
+@IF "%devroot:~-1%"=="\" set devroot=%devroot:~0,-1%
 
 @set projectname=swiftshader-dist-win
 @set "ERRORLEVEL="

diff --git a/buildscript/ci/ci.cmd b/buildscript/ci/ci.cmd
@@ -2,6 +2,7 @@
 @cd "%~dp0"
 @cd ..\..\..\
 @for %%a in ("%cd%") do @set devroot=%%~sa
+@IF "%devroot:~-1%"=="\" set devroot=%devroot:~0,-1%
 @set projectname=swiftshader-dist-win
 @IF /I %1==collectuids GOTO collectuids
 @IF /I NOT %1==collectuids GOTO runci
@@ -92,4 +93,4 @@
 
 :doneci
 @IF defined uptodatebuild call %devroot%\%projectname%\buildscript\ci\pushvar.cmd uptodatebuild
-@cd %devroot%
+@cd %devroot%\
diff --git a/buildscript/modules/dist.cmd b/buildscript/modules/dist.cmd
@@ -13,6 +13,6 @@
 @IF EXIST libGLESv2_deprecated.dll REN libGLESv2_deprecated.dll libGLESv2.dll
 @echo.
 @endlocal
-@cd %devroot%
+@cd %devroot%\
 @IF %cimode% EQU 0 pause
 @IF %cimode% EQU 0 echo.
diff --git a/buildscript/modules/swiftshader.cmd b/buildscript/modules/swiftshader.cmd
@@ -141,4 +141,4 @@
 :skipbuild
 @rem Reset environment after swiftshader build.
 @endlocal
-@cd %devroot%
+@cd %devroot%\