windows fix
Some checks failed
demo.yaml / windows fix (push) Failing after 0s

This commit is contained in:
Jorijn van der Graaf 2026-03-02 18:29:34 +01:00
commit f85cb35f75
2 changed files with 14 additions and 28 deletions

View file

@ -2,7 +2,7 @@ mkdir build
mkdir bin mkdir bin
mkdir bin\executable-windows-msvc mkdir bin\executable-windows-msvc
git clone https:\\github.com\KhronosGroup\glslang.git .\build\glslang git clone https:/github.com/KhronosGroup/glslang.git ./build/glslang
cd .\build\glslang cd .\build\glslang

View file

@ -11,26 +11,13 @@
"type": "cmake", "type": "cmake",
"options": "-DENABLE_OPT=OFF" "options": "-DENABLE_OPT=OFF"
} }
] ],
},
{
"name": "libs-linux-gnu",
"target": "x86_64-pc-linux-gnu",
"libs": ["MachineIndependent", "OSDependent", "GenericCodeGen", "glslang", "glslang-default-resource-limits", "SPIRV"] "libs": ["MachineIndependent", "OSDependent", "GenericCodeGen", "glslang", "glslang-default-resource-limits", "SPIRV"]
}, },
{
"name": "libs-windows-msvc",
"target": "x86_64-pc-windows-msvc",
"libs": ["vulkan-1", "MachineIndependent", "OSDependent", "GenericCodeGen", "glslang", "glslang-default-resource-limits", "SPIRV", "SPIRV-Tools-opt", "SPIRV-Tools"]
},
{
"name": "libs-windows-msvc-debug",
"target": "x86_64-pc-windows-msvc",
"libs": ["vulkan-1", "MachineIndependentd", "OSDependentd", "GenericCodeGend", "glslangd", "glslang-default-resource-limitsd", "SPIRVd", "SPIRV-Tools-optd", "SPIRV-Toolsd"]
},
{ {
"name": "executable-linux-gnu", "name": "executable-linux-gnu",
"extends": ["base", "libs-linux-gnu"], "target": "x86_64-pc-linux-gnu",
"extends": ["base"],
"implementations": ["implementations/main"] "implementations": ["implementations/main"]
}, },
{ {
@ -40,36 +27,35 @@
}, },
{ {
"name": "lib-linux-gnu", "name": "lib-linux-gnu",
"extends": ["base", "libs-linux-gnu"], "target": "x86_64-pc-linux-gnu",
"extends": ["base"],
"type":"library" "type":"library"
}, },
{ {
"name": "lib-linux-gnu-dev", "name": "lib-linux-gnu-debug",
"extends": ["lib-linux-gnu"], "extends": ["lib-linux-gnu"],
"debug": true "debug": true
}, },
{ {
"name": "executable-windows-msvc", "name": "executable-windows-msvc",
"extends": ["base", "libs-windows-msvc"], "target": "x86_64-pc-windows-msvc",
"extends": ["base"],
"implementations": ["implementations/main"] "implementations": ["implementations/main"]
}, },
{ {
"name": "executable-windows-msvc-debug", "name": "executable-windows-msvc-debug",
"extends": ["base", "libs-windows-msvc-debug"], "extends": ["executable-windows-msvc"],
"implementations": ["implementations/main"],
"debug": true "debug": true
}, },
{ {
"name": "lib-windows-msvc", "name": "lib-windows-msvc",
"extends": ["base", "libs-windows-msvc"], "target": "x86_64-pc-windows-msvc",
"type":"library", "extends": ["base"],
"implementations": ["implementations/main"] "type":"library"
}, },
{ {
"name": "lib-windows-msvc-debug", "name": "lib-windows-msvc-debug",
"extends": ["base", "libs-windows-msvc-debug"], "extends": ["lib-windows-msvc"],
"type":"library",
"implementations": ["implementations/main"],
"debug": true "debug": true
} }
] ]