diff --git a/build.ps1 b/build.ps1 index cc12bc7..f928c63 100644 --- a/build.ps1 +++ b/build.ps1 @@ -2,7 +2,7 @@ mkdir build mkdir bin 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 diff --git a/project.json b/project.json index 96d777a..5baff11 100644 --- a/project.json +++ b/project.json @@ -11,26 +11,13 @@ "type": "cmake", "options": "-DENABLE_OPT=OFF" } - ] - }, - { - "name": "libs-linux-gnu", - "target": "x86_64-pc-linux-gnu", + ], "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", - "extends": ["base", "libs-linux-gnu"], + "target": "x86_64-pc-linux-gnu", + "extends": ["base"], "implementations": ["implementations/main"] }, { @@ -40,36 +27,35 @@ }, { "name": "lib-linux-gnu", - "extends": ["base", "libs-linux-gnu"], + "target": "x86_64-pc-linux-gnu", + "extends": ["base"], "type":"library" }, { - "name": "lib-linux-gnu-dev", + "name": "lib-linux-gnu-debug", "extends": ["lib-linux-gnu"], "debug": true }, { "name": "executable-windows-msvc", - "extends": ["base", "libs-windows-msvc"], + "target": "x86_64-pc-windows-msvc", + "extends": ["base"], "implementations": ["implementations/main"] }, { "name": "executable-windows-msvc-debug", - "extends": ["base", "libs-windows-msvc-debug"], - "implementations": ["implementations/main"], + "extends": ["executable-windows-msvc"], "debug": true }, { "name": "lib-windows-msvc", - "extends": ["base", "libs-windows-msvc"], - "type":"library", - "implementations": ["implementations/main"] + "target": "x86_64-pc-windows-msvc", + "extends": ["base"], + "type":"library" }, { "name": "lib-windows-msvc-debug", - "extends": ["base", "libs-windows-msvc-debug"], - "type":"library", - "implementations": ["implementations/main"], + "extends": ["lib-windows-msvc"], "debug": true } ]