Turn vulkan into addin

.github/workflows/build.yml

@@ -61,7 +61,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-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared]
+        variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-4.3-shared,lgpl-4.3-shared]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -89,7 +89,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-vulkan-shared,lgpl-vulkan-shared,gpl-4.3-shared,lgpl-4.3-shared]
+        variant: [gpl,lgpl,gpl vulkan,lgpl vulkan,gpl-4.3,lgpl-4.3,gpl-shared,lgpl-shared,gpl-shared vulkan,lgpl-shared vulkan,gpl-4.3-shared,lgpl-4.3-shared]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

addins/vulkan.sh

@@ -0,0 +1 @@
+#!/bin/bash

scripts.d/45-vulkan.sh

@@ -4,7 +4,7 @@ LOADER_REPO="https://github.com/BtbN/Vulkan-Loader.git"
 LOADER_COMMIT="71b69578649bbed2696a21f063c0e3c15d36ce36"
 
 ffbuild_enabled() {
-    [[ $VARIANT != *vulkan* ]] && return -1
+    [[ $ADDINS_STR != *vulkan* ]] && return -1
     return 0
 }
 

scripts.d/50-glslang.sh

@@ -4,7 +4,7 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git"
 GLSLANG_COMMIT="d0e7ed37fc4ee17948a8a6597ce95a4fdab2b769"
 
 ffbuild_enabled() {
-    [[ $VARIANT != *vulkan* ]] && return -1
+    [[ $ADDINS_STR != *vulkan* ]] && return -1
     return 0
 }
 

variants/win64-gpl-vulkan-shared.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh

variants/win64-gpl-vulkan.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh

variants/win64-lgpl-vulkan-shared.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh

variants/win64-lgpl-vulkan.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh