diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 264dd3e..c369d30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: fail-fast: false matrix: target: [win64] - variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-shared 4.3,lgpl-shared 4.3] + variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3] steps: - name: Checkout uses: actions/checkout@v2 @@ -103,7 +103,7 @@ jobs: fail-fast: false matrix: target: [win64] - variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-shared 4.3,lgpl-shared 4.3] + variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c43cac3..91dea4d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: target: [win64] - variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-shared 4.3,lgpl-shared 4.3] + variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/README.md b/README.md index 8959e4d..a3c177b 100644 --- a/README.md +++ b/README.md @@ -41,5 +41,4 @@ Available in `gpl`, `lgpl`, `gpl-shared` and `lgpl-shared` variants. All of those can be optionally combined with any combination of addins. Currently that's `4.3`, to build from the 4.3 release branch instead of master. -`vulkan` to add support for (and a hard runtime dependency on) Vulkan. `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB. diff --git a/addins/vulkan.sh b/addins/vulkan.sh deleted file mode 100644 index a9bf588..0000000 --- a/addins/vulkan.sh +++ /dev/null @@ -1 +0,0 @@ -#!/bin/bash diff --git a/scripts.d/45-vulkan.sh b/scripts.d/45-vulkan.sh index 7e43fa2..900830a 100755 --- a/scripts.d/45-vulkan.sh +++ b/scripts.d/45-vulkan.sh @@ -4,7 +4,6 @@ LOADER_REPO="https://github.com/KhronosGroup/Vulkan-Loader.git" LOADER_COMMIT="7ea01c139ffc7c33cd12bd258c1bc8bf530c6d2d" ffbuild_enabled() { - [[ $ADDINS_STR != *vulkan* ]] && return -1 return 0 } diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh index 65c751e..aad706c 100755 --- a/scripts.d/50-glslang.sh +++ b/scripts.d/50-glslang.sh @@ -4,7 +4,6 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git" GLSLANG_COMMIT="5878bcb17e43bf22cecaf6095900a33ff7f53445" ffbuild_enabled() { - [[ $ADDINS_STR != *vulkan* ]] && return -1 return 0 }