mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	Merge pull request #3861 from lat9nq/ci-enable-vulkan
CI: Re-enable building yuzu with Vulkan enabled on Linux and MinGW
This commit is contained in:
		
						commit
						a925ae79ff
					
				
							
								
								
									
										2
									
								
								.ci/scripts/linux/docker.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										2
									
								
								.ci/scripts/linux/docker.sh
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							@ -5,7 +5,7 @@ cd /yuzu
 | 
				
			|||||||
ccache -s
 | 
					ccache -s
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mkdir build || true && cd build
 | 
					mkdir build || true && cd build
 | 
				
			||||||
cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_VULKAN=No
 | 
					cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ninja
 | 
					ninja
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,7 @@ echo '' >> /bin/cmd
 | 
				
			|||||||
chmod +x /bin/cmd
 | 
					chmod +x /bin/cmd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mkdir build || true && cd build
 | 
					mkdir build || true && cd build
 | 
				
			||||||
cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_VULKAN=No
 | 
					cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release
 | 
				
			||||||
ninja
 | 
					ninja
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Clean up the dirty hacks
 | 
					# Clean up the dirty hacks
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user