mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-31 20:51:12 -06:00 
			
		
		
		
	Add TIFF and JPEG for wxWidgets
using URL does not download git submodules for wx
This commit is contained in:
		
							parent
							
								
									ac51a7c3d1
								
							
						
					
					
						commit
						a6a8063768
					
				
					 4 changed files with 17 additions and 3 deletions
				
			
		
							
								
								
									
										2
									
								
								deps/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								deps/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -173,6 +173,8 @@ include(NLopt/NLopt.cmake) | |||
| include(OpenSSL/OpenSSL.cmake) | ||||
| include(CURL/CURL.cmake) | ||||
| 
 | ||||
| include(JPEG/JPEG.cmake) | ||||
| include(TIFF/TIFF.cmake) | ||||
| include(wxWidgets/wxWidgets.cmake) | ||||
| 
 | ||||
| set(_dep_list | ||||
|  |  | |||
							
								
								
									
										5
									
								
								deps/JPEG/JPEG.cmake
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								deps/JPEG/JPEG.cmake
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,5 @@ | |||
| prusaslicer_add_cmake_project(JPEG | ||||
|     URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.0.6.zip | ||||
|     URL_HASH SHA256=017bdc33ff3a72e11301c0feb4657cb27719d7f97fa67a78ed506c594218bbf1 | ||||
|     DEPENDS ${ZLIB_PKG} | ||||
| ) | ||||
							
								
								
									
										7
									
								
								deps/TIFF/TIFF.cmake
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								deps/TIFF/TIFF.cmake
									
										
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,7 @@ | |||
| find_package(OpenGL QUIET REQUIRED) | ||||
| 
 | ||||
| prusaslicer_add_cmake_project(TIFF | ||||
|     URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip | ||||
|     URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32 | ||||
|     DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG | ||||
| ) | ||||
							
								
								
									
										6
									
								
								deps/wxWidgets/wxWidgets.cmake
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								deps/wxWidgets/wxWidgets.cmake
									
										
									
									
										vendored
									
									
								
							|  | @ -14,7 +14,7 @@ prusaslicer_add_cmake_project(wxWidgets | |||
|     # GIT_TAG tm_cross_compile #${_wx_git_tag} | ||||
|     URL https://github.com/prusa3d/wxWidgets/archive/refs/heads/tm_cross_compile.zip | ||||
|     URL_HASH SHA256=592aa716a4e8d609b74cdbd08a943e628f3c32b3ca6e4f76fb5f3d5698898dc1 | ||||
|     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} | ||||
|     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG | ||||
|     CMAKE_ARGS | ||||
|         -DwxBUILD_PRECOMP=ON | ||||
|         ${_wx_toolkit} | ||||
|  | @ -28,8 +28,8 @@ prusaslicer_add_cmake_project(wxWidgets | |||
|         -DwxUSE_ZLIB=sys | ||||
|         -DwxUSE_REGEX=builtin | ||||
|         -DwxUSE_LIBXPM=builtin | ||||
|         -DwxUSE_LIBJPEG=builtin | ||||
|         -DwxUSE_LIBTIFF=builtin | ||||
|         -DwxUSE_LIBJPEG=sys | ||||
|         -DwxUSE_LIBTIFF=sys | ||||
|         -DwxUSE_EXPAT=sys | ||||
|         -DwxUSE_LIBSDL=OFF | ||||
|         -DwxUSE_XTEST=OFF | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 tamasmeszaros
						tamasmeszaros