|
@@ -19,8 +19,8 @@ if "%HLSL_SRC_DIR%"=="" (
|
|
|
)
|
|
|
|
|
|
if "%1"=="-buildoutdir" (
|
|
|
- echo Build output directory set to %2
|
|
|
- set HLSL_BLD_DIR=%2
|
|
|
+ echo Build output directory set to %~2
|
|
|
+ set "HLSL_BLD_DIR=%~2"
|
|
|
shift /1
|
|
|
shift /1
|
|
|
)
|
|
@@ -81,15 +81,15 @@ if "%1"=="-fv" (
|
|
|
shift /1
|
|
|
)
|
|
|
if "%1"=="-fvloc" (
|
|
|
- echo Fixed version flag set for build, version file location: %2
|
|
|
+ echo Fixed version flag set for build, version file location: %~2
|
|
|
set FIXED_VER=ON
|
|
|
- set FIXED_LOC=%2
|
|
|
+ set "FIXED_LOC=%~2"
|
|
|
shift /1
|
|
|
shift /1
|
|
|
)
|
|
|
if "%1"=="-cv" (
|
|
|
echo Set the CLANG_VENDOR value.
|
|
|
- set VENDOR=%2
|
|
|
+ set "VENDOR=%~2"
|
|
|
shift /1
|
|
|
shift /1
|
|
|
)
|
|
@@ -135,11 +135,11 @@ if "%1"=="-vs2019" (
|
|
|
)
|
|
|
|
|
|
if "%1"=="-tblgen" (
|
|
|
- if "%2" == "" (
|
|
|
+ if "%~2" == "" (
|
|
|
echo Missing path argument after -tblgen.
|
|
|
exit /b
|
|
|
)
|
|
|
- set BUILD_TBLGEN_PATH=%2
|
|
|
+ set "BUILD_TBLGEN_PATH=%~2"
|
|
|
shift /1
|
|
|
shift /1
|
|
|
)
|
|
@@ -166,19 +166,19 @@ if "%1"=="-dxc-cmake-extra-args" (
|
|
|
)
|
|
|
|
|
|
if "%1"=="-dxc-cmake-begins-include" (
|
|
|
- set CMAKE_OPTS=%CMAKE_OPTS% -DDXC_CMAKE_BEGINS_INCLUDE=%2
|
|
|
+ set "CMAKE_OPTS=%CMAKE_OPTS% -DDXC_CMAKE_BEGINS_INCLUDE=%~2"
|
|
|
shift /1
|
|
|
shift /1
|
|
|
)
|
|
|
|
|
|
if "%1"=="-dxc-cmake-ends-include" (
|
|
|
- set CMAKE_OPTS=%CMAKE_OPTS% -DDXC_CMAKE_ENDS_INCLUDE=%2
|
|
|
+ set "CMAKE_OPTS=%CMAKE_OPTS% -DDXC_CMAKE_ENDS_INCLUDE=%~2"
|
|
|
shift /1
|
|
|
shift /1
|
|
|
)
|
|
|
|
|
|
if "%1"=="-dxc-cmake" (
|
|
|
- set CMAKE_PATH=%~2
|
|
|
+ set "CMAKE_PATH=%~2"
|
|
|
shift /1
|
|
|
shift /1
|
|
|
)
|
|
@@ -396,8 +396,8 @@ cd /d %3
|
|
|
if "%DO_SETUP%"=="1" (
|
|
|
echo Creating solution files for %2, logging to %3\cmake-log.txt
|
|
|
if "%BUILD_GENERATOR%"=="Ninja" (
|
|
|
- echo Running %CMAKE_PATH% -DCMAKE_BUILD_TYPE:STRING=%1 %CMAKE_OPTS% -G %4 %HLSL_SRC_DIR% > %3\cmake-log.txt
|
|
|
- %CMAKE_PATH% -DCMAKE_BUILD_TYPE:STRING=%1 %CMAKE_OPTS% -G %4 %HLSL_SRC_DIR% >> %3\cmake-log.txt 2>&1
|
|
|
+ echo Running "%CMAKE_PATH%" -DCMAKE_BUILD_TYPE:STRING=%1 %CMAKE_OPTS% -G %4 %HLSL_SRC_DIR% > %3\cmake-log.txt
|
|
|
+ "%CMAKE_PATH%" -DCMAKE_BUILD_TYPE:STRING=%1 %CMAKE_OPTS% -G %4 %HLSL_SRC_DIR% >> %3\cmake-log.txt 2>&1
|
|
|
) else (
|
|
|
rem -DCMAKE_BUILD_TYPE:STRING=%1 is not necessary for multi-config generators like VS
|
|
|
echo Running "%CMAKE_PATH%" %CMAKE_OPTS% -G %4 %5 %HLSL_SRC_DIR% > %3\cmake-log.txt
|