Turn vulkan into addin

This commit is contained in:
BtbN 2020-09-27 23:15:17 +02:00
parent e90d9436fc
commit b7f606db23
8 changed files with 5 additions and 12 deletions

View File

@ -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

1
addins/vulkan.sh Normal file
View File

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

View File

@ -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
}

View File

@ -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
}

View File

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

View File

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

View File

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

View File

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