mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-11-02 20:51:23 -07:00 
			
		
		
		
	ENH: use wxFont::AddPrivateFont to load fonts for linux
Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
This commit is contained in:
		
							parent
							
								
									8f330d8b82
								
							
						
					
					
						commit
						27d2008037
					
				
					 3 changed files with 19 additions and 2 deletions
				
			
		
							
								
								
									
										4
									
								
								deps/wxWidgets/wxWidgets.cmake
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								deps/wxWidgets/wxWidgets.cmake
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -7,6 +7,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 | 
			
		|||
        set(_gtk_ver 3)
 | 
			
		||||
    endif ()
 | 
			
		||||
    set(_wx_toolkit "-DwxBUILD_TOOLKIT=gtk${_gtk_ver}")
 | 
			
		||||
    set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
 | 
			
		||||
else ()
 | 
			
		||||
    set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=0")
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
if (MSVC)
 | 
			
		||||
| 
						 | 
				
			
			@ -30,6 +33,7 @@ bambustudio_add_cmake_project(wxWidgets
 | 
			
		|||
        -DwxUSE_MEDIACTRL=ON
 | 
			
		||||
        -DwxUSE_DETECT_SM=OFF
 | 
			
		||||
        -DwxUSE_UNICODE=ON
 | 
			
		||||
        ${_wx_private_font}
 | 
			
		||||
        -DwxUSE_OPENGL=ON
 | 
			
		||||
        -DwxUSE_WEBVIEW=ON
 | 
			
		||||
        ${_wx_edge}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue