Turn vulkan into addin
This commit is contained in:
		
							parent
							
								
									e90d9436fc
								
							
						
					
					
						commit
						b7f606db23
					
				
					 8 changed files with 5 additions and 12 deletions
				
			
		
							
								
								
									
										4
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/build.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -61,7 +61,7 @@ jobs:
 | 
				
			||||||
      fail-fast: false
 | 
					      fail-fast: false
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        target: [win64]
 | 
					        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:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					      - name: Checkout
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
| 
						 | 
					@ -89,7 +89,7 @@ jobs:
 | 
				
			||||||
      fail-fast: false
 | 
					      fail-fast: false
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        target: [win64]
 | 
					        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:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					      - name: Checkout
 | 
				
			||||||
        uses: actions/checkout@v2
 | 
					        uses: actions/checkout@v2
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										1
									
								
								addins/vulkan.sh
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								addins/vulkan.sh
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					#!/bin/bash
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@ LOADER_REPO="https://github.com/BtbN/Vulkan-Loader.git"
 | 
				
			||||||
LOADER_COMMIT="71b69578649bbed2696a21f063c0e3c15d36ce36"
 | 
					LOADER_COMMIT="71b69578649bbed2696a21f063c0e3c15d36ce36"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ffbuild_enabled() {
 | 
					ffbuild_enabled() {
 | 
				
			||||||
    [[ $VARIANT != *vulkan* ]] && return -1
 | 
					    [[ $ADDINS_STR != *vulkan* ]] && return -1
 | 
				
			||||||
    return 0
 | 
					    return 0
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,7 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git"
 | 
				
			||||||
GLSLANG_COMMIT="d0e7ed37fc4ee17948a8a6597ce95a4fdab2b769"
 | 
					GLSLANG_COMMIT="d0e7ed37fc4ee17948a8a6597ce95a4fdab2b769"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ffbuild_enabled() {
 | 
					ffbuild_enabled() {
 | 
				
			||||||
    [[ $VARIANT != *vulkan* ]] && return -1
 | 
					    [[ $ADDINS_STR != *vulkan* ]] && return -1
 | 
				
			||||||
    return 0
 | 
					    return 0
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +0,0 @@
 | 
				
			||||||
#!/bin/bash
 | 
					 | 
				
			||||||
source "$(dirname "$BASH_SOURCE")"/win64-gpl-shared.sh
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,2 +0,0 @@
 | 
				
			||||||
#!/bin/bash
 | 
					 | 
				
			||||||
source "$(dirname "$BASH_SOURCE")"/win64-gpl.sh
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,2 +0,0 @@
 | 
				
			||||||
#!/bin/bash
 | 
					 | 
				
			||||||
source "$(dirname "$BASH_SOURCE")"/win64-lgpl-shared.sh
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,2 +0,0 @@
 | 
				
			||||||
#!/bin/bash
 | 
					 | 
				
			||||||
source "$(dirname "$BASH_SOURCE")"/win64-lgpl.sh
 | 
					 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue