forked from eden-emu/eden
		
	externals: Use upstream zlib
We don't need to depend on a custom fork for this. We can add the library as is, and then make it excluded from the ALL target, so we only link in the libraries that we actually make use of.
This commit is contained in:
		
							parent
							
								
									e2547d51c6
								
							
						
					
					
						commit
						ee8483cf04
					
				
					 4 changed files with 10 additions and 9 deletions
				
			
		|  | @ -11,4 +11,5 @@ ninja | ||||||
| 
 | 
 | ||||||
| ccache -s | ccache -s | ||||||
| 
 | 
 | ||||||
| ctest -VV -C Release | # Ignore zlib's tests, since they aren't gated behind a CMake option. | ||||||
|  | ctest -VV -E "(example|example64)" -C Release | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							|  | @ -51,4 +51,4 @@ | ||||||
|     url = https://github.com/DarkLordZach/libzip |     url = https://github.com/DarkLordZach/libzip | ||||||
| [submodule "zlib"] | [submodule "zlib"] | ||||||
|     path = externals/zlib |     path = externals/zlib | ||||||
| 	url = https://github.com/DarkLordZach/zlib |     url = https://github.com/madler/zlib | ||||||
|  |  | ||||||
							
								
								
									
										6
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -77,12 +77,12 @@ if (ENABLE_VULKAN) | ||||||
|     add_subdirectory(sirit) |     add_subdirectory(sirit) | ||||||
| endif() | endif() | ||||||
| 
 | 
 | ||||||
|  | # zlib | ||||||
|  | add_subdirectory(zlib EXCLUDE_FROM_ALL) | ||||||
|  | 
 | ||||||
| # libzip | # libzip | ||||||
| add_subdirectory(libzip) | add_subdirectory(libzip) | ||||||
| 
 | 
 | ||||||
| # zlib |  | ||||||
| add_subdirectory(zlib) |  | ||||||
| 
 |  | ||||||
| if (ENABLE_WEB_SERVICE) | if (ENABLE_WEB_SERVICE) | ||||||
|     # LibreSSL |     # LibreSSL | ||||||
|     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") |     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								externals/zlib
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								externals/zlib
									
										
									
									
										vendored
									
									
								
							|  | @ -1 +1 @@ | ||||||
| Subproject commit 094ed57db392170130bc710293568de7b576306d | Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Lioncash
						Lioncash