mirror of
https://github.com/microsoft/DirectXTex.git
synced 2026-02-12 15:46:14 +01:00
Update CMake to specify FXC.EXE to use (#502)
Some checks are pending
CodeQL / Analyze (C/C++) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug-Clang, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release-Clang, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug-Clang, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release-Clang, windows-2022) (push) Waiting to run
MSBuild / build (Debug, ARM64, 2019) (push) Waiting to run
MSBuild / build (Debug, ARM64, 2022) (push) Waiting to run
MSBuild / build (Debug, x64, 2019) (push) Waiting to run
MSBuild / build (Debug, x64, 2022) (push) Waiting to run
MSBuild / build (Debug, x86, 2019) (push) Waiting to run
MSBuild / build (Debug, x86, 2022) (push) Waiting to run
MSBuild / build (Release, ARM64, 2019) (push) Waiting to run
MSBuild / build (Release, ARM64, 2022) (push) Waiting to run
MSBuild / build (Release, x64, 2019) (push) Waiting to run
MSBuild / build (Release, x64, 2022) (push) Waiting to run
MSBuild / build (Release, x86, 2019) (push) Waiting to run
MSBuild / build (Release, x86, 2022) (push) Waiting to run
Microsoft C++ Code Analysis / Analyze (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug-Clang, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release-Clang, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug-Clang, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release-Clang, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-Clang-VCPKG, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, windows-2019) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_arm64, arm64-Debug-VCPKG, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_x86, x86-Debug-VCPKG, windows-2022) (push) Waiting to run
CMake (WSL) / build (x64-Debug-Linux) (push) Waiting to run
CMake (WSL) / build (x64-Release-Linux) (push) Waiting to run
Some checks are pending
CodeQL / Analyze (C/C++) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Debug-Clang, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64, x64-Release-Clang, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_arm64, arm64ec-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Debug-Clang, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, windows-2019) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release, windows-2022) (push) Waiting to run
CMake (Windows) / build (amd64_x86, x86-Release-Clang, windows-2022) (push) Waiting to run
MSBuild / build (Debug, ARM64, 2019) (push) Waiting to run
MSBuild / build (Debug, ARM64, 2022) (push) Waiting to run
MSBuild / build (Debug, x64, 2019) (push) Waiting to run
MSBuild / build (Debug, x64, 2022) (push) Waiting to run
MSBuild / build (Debug, x86, 2019) (push) Waiting to run
MSBuild / build (Debug, x86, 2022) (push) Waiting to run
MSBuild / build (Release, ARM64, 2019) (push) Waiting to run
MSBuild / build (Release, ARM64, 2022) (push) Waiting to run
MSBuild / build (Release, x64, 2019) (push) Waiting to run
MSBuild / build (Release, x64, 2022) (push) Waiting to run
MSBuild / build (Release, x86, 2019) (push) Waiting to run
MSBuild / build (Release, x86, 2022) (push) Waiting to run
Microsoft C++ Code Analysis / Analyze (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Debug-Clang, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64, x64-Release-Clang, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_arm64, arm64ec-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Debug-Clang, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, windows-2019) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release, windows-2022) (push) Waiting to run
CTest (Windows) / build (amd64_x86, x86-Release-Clang, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-Clang-VCPKG, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, windows-2019) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64, x64-Debug-VCPKG, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_arm64, arm64-Debug-VCPKG, windows-2022) (push) Waiting to run
CMake (Windows using VCPKG) / build (amd64_x86, x86-Debug-VCPKG, windows-2022) (push) Waiting to run
CMake (WSL) / build (x64-Debug-Linux) (push) Waiting to run
CMake (WSL) / build (x64-Release-Linux) (push) Waiting to run
This commit is contained in:
@@ -9,6 +9,7 @@ if %PROCESSOR_ARCHITECTURE%.==ARM64. (set FXCARCH=arm64) else (if %PROCESSOR_ARC
|
||||
|
||||
set FXCOPTS=/nologo /WX /Ges /Zi /Zpc /Qstrip_reflect /Qstrip_debug
|
||||
|
||||
if defined LegacyShaderCompiler goto fxcviaenv
|
||||
set PCFXC="%WindowsSdkVerBinPath%%FXCARCH%\fxc.exe"
|
||||
if exist %PCFXC% goto continue
|
||||
set PCFXC="%WindowsSdkBinPath%%WindowsSDKVersion%\%FXCARCH%\fxc.exe"
|
||||
@@ -17,6 +18,12 @@ set PCFXC="%WindowsSdkDir%bin\%WindowsSDKVersion%\%FXCARCH%\fxc.exe"
|
||||
if exist %PCFXC% goto continue
|
||||
|
||||
set PCFXC=fxc.exe
|
||||
goto continue
|
||||
|
||||
:fxcviaenv
|
||||
set PCFXC="%LegacyShaderCompiler%"
|
||||
if not exist %PCFXC% goto needfxc
|
||||
goto continue
|
||||
|
||||
:continue
|
||||
if not defined CompileShadersOutput set CompileShadersOutput=Compiled
|
||||
@@ -54,3 +61,7 @@ echo %fxc%
|
||||
echo %fxc4%
|
||||
%fxc4% || set error=1
|
||||
exit /b
|
||||
|
||||
:needfxc
|
||||
echo ERROR: CompileShaders requires FXC.EXE
|
||||
exit /b 1
|
||||
|
||||
Reference in New Issue
Block a user