From b7f606db23cd7797785236e8c26a4f1b1bede058 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 27 Sep 2020 23:15:17 +0200
Subject: [PATCH] Turn vulkan into addin

---
 .github/workflows/build.yml          | 4 ++--
 addins/vulkan.sh                     | 1 +
 scripts.d/45-vulkan.sh               | 2 +-
 scripts.d/50-glslang.sh              | 2 +-
 variants/win64-gpl-vulkan-shared.sh  | 2 --
 variants/win64-gpl-vulkan.sh         | 2 --
 variants/win64-lgpl-vulkan-shared.sh | 2 --
 variants/win64-lgpl-vulkan.sh        | 2 --
 8 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 addins/vulkan.sh
 delete mode 100644 variants/win64-gpl-vulkan-shared.sh
 delete mode 100644 variants/win64-gpl-vulkan.sh
 delete mode 100644 variants/win64-lgpl-vulkan-shared.sh
 delete mode 100644 variants/win64-lgpl-vulkan.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69227e6..d3d7a2a 100644
--- a/.github/workflows/build.yml
+++ b/.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
diff --git a/addins/vulkan.sh b/addins/vulkan.sh
new file mode 100644
index 0000000..a9bf588
--- /dev/null
+++ b/addins/vulkan.sh
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/scripts.d/45-vulkan.sh b/scripts.d/45-vulkan.sh
index 77f33fb..5ad8d60 100755
--- a/scripts.d/45-vulkan.sh
+++ b/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
 }
 
diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh
index 824df6d..d4defe8 100755
--- a/scripts.d/50-glslang.sh
+++ b/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
 }
 
diff --git a/variants/win64-gpl-vulkan-shared.sh b/variants/win64-gpl-vulkan-shared.sh
deleted file mode 100644
index 606f182..0000000
--- a/variants/win64-gpl-vulkan-shared.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh
diff --git a/variants/win64-gpl-vulkan.sh b/variants/win64-gpl-vulkan.sh
deleted file mode 100644
index 62390a8..0000000
--- a/variants/win64-gpl-vulkan.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh
diff --git a/variants/win64-lgpl-vulkan-shared.sh b/variants/win64-lgpl-vulkan-shared.sh
deleted file mode 100644
index 7bf8f63..0000000
--- a/variants/win64-lgpl-vulkan-shared.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh
diff --git a/variants/win64-lgpl-vulkan.sh b/variants/win64-lgpl-vulkan.sh
deleted file mode 100644
index ec75252..0000000
--- a/variants/win64-lgpl-vulkan.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh