mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-30 06:50:06 +00:00 
			
		
		
		
	Merge pull request #501 from dpaulat/feature/2025-08-dependency-updates
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				CI / macos_clang18_arm64 (push) Has been cancelled
				
			
		
			
				
	
				CI / macos_clang18_x64 (push) Has been cancelled
				
			
		
			
				
	
				CI / windows_msvc2022_x64 (push) Has been cancelled
				
			
		
			
				
	
				CI / linux_gcc_arm64 (push) Has been cancelled
				
			
		
			
				
	
				CI / linux_clang_x64 (push) Has been cancelled
				
			
		
			
				
	
				CI / linux_gcc_x64 (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	CI / macos_clang18_arm64 (push) Has been cancelled
				
			CI / macos_clang18_x64 (push) Has been cancelled
				
			CI / windows_msvc2022_x64 (push) Has been cancelled
				
			CI / linux_gcc_arm64 (push) Has been cancelled
				
			CI / linux_clang_x64 (push) Has been cancelled
				
			CI / linux_gcc_x64 (push) Has been cancelled
				
			2025-08 Dependency Updates
This commit is contained in:
		
						commit
						de43670ec2
					
				
					 7 changed files with 40 additions and 37 deletions
				
			
		
							
								
								
									
										60
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										60
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							|  | @ -1,45 +1,45 @@ | |||
| [submodule "external/cmake-conan"] | ||||
| 	path = external/cmake-conan | ||||
| 	url = https://github.com/conan-io/cmake-conan.git | ||||
| [submodule "test/data"] | ||||
| 	path = test/data | ||||
| 	url = https://github.com/dpaulat/supercell-wx-test-data | ||||
| [submodule "external/hsluv-c"] | ||||
| 	path = external/hsluv-c | ||||
| 	url = https://github.com/hsluv/hsluv-c.git | ||||
| [submodule "external/stb"] | ||||
| 	path = external/stb | ||||
| 	url = https://github.com/nothings/stb.git | ||||
| [submodule "data"] | ||||
| 	path = data | ||||
| 	url = https://github.com/dpaulat/supercell-wx-data | ||||
| [submodule "external/aws-sdk-cpp"] | ||||
| 	path = external/aws-sdk-cpp | ||||
| 	url = https://github.com/aws/aws-sdk-cpp.git | ||||
| [submodule "external/cmake-conan"] | ||||
| 	path = external/cmake-conan | ||||
| 	url = https://github.com/conan-io/cmake-conan.git | ||||
| [submodule "external/date"] | ||||
| 	path = external/date | ||||
| 	url = https://github.com/HowardHinnant/date.git | ||||
| [submodule "external/glad"] | ||||
| 	path = external/glad | ||||
| 	url = https://github.com/Dav1dde/glad.git | ||||
| [submodule "external/hsluv-c"] | ||||
| 	path = external/hsluv-c | ||||
| 	url = https://github.com/hsluv/hsluv-c.git | ||||
| [submodule "external/imgui"] | ||||
| 	path = external/imgui | ||||
| 	url = https://github.com/ocornut/imgui.git | ||||
| [submodule "external/imgui-backend-qt"] | ||||
| 	path = external/imgui-backend-qt | ||||
| 	url = https://github.com/dpaulat/imgui-backend-qt | ||||
| [submodule "external/aws-sdk-cpp"] | ||||
| 	path = external/aws-sdk-cpp | ||||
| 	url = https://github.com/aws/aws-sdk-cpp.git | ||||
| [submodule "external/date"] | ||||
| 	path = external/date | ||||
| 	url = https://github.com/HowardHinnant/date.git | ||||
| [submodule "external/units"] | ||||
| 	path = external/units | ||||
| 	url = https://github.com/nholthaus/units.git | ||||
| [submodule "external/textflowcpp"] | ||||
| 	path = external/textflowcpp | ||||
| 	url = https://github.com/catchorg/textflowcpp.git | ||||
| [submodule "external/maplibre-native-qt"] | ||||
| 	path = external/maplibre-native-qt | ||||
| 	url = https://github.com/dpaulat/maplibre-native-qt.git | ||||
| [submodule "external/maplibre-native"] | ||||
| 	path = external/maplibre-native | ||||
| 	url = https://github.com/dpaulat/maplibre-gl-native.git | ||||
| [submodule "external/maplibre-native-qt"] | ||||
| 	path = external/maplibre-native-qt | ||||
| 	url = https://github.com/dpaulat/maplibre-native-qt.git | ||||
| [submodule "external/qt6ct"] | ||||
| 	path = external/qt6ct | ||||
| 	url = https://github.com/AdenKoperczak/qt6ct.git | ||||
| [submodule "external/glad"] | ||||
| 	path = external/glad | ||||
| 	url = https://github.com/Dav1dde/glad.git | ||||
| [submodule "external/stb"] | ||||
| 	path = external/stb | ||||
| 	url = https://github.com/nothings/stb.git | ||||
| [submodule "external/textflowcpp"] | ||||
| 	path = external/textflowcpp | ||||
| 	url = https://github.com/catchorg/textflowcpp.git | ||||
| [submodule "external/units"] | ||||
| 	path = external/units | ||||
| 	url = https://github.com/nholthaus/units.git | ||||
| [submodule "test/data"] | ||||
| 	path = test/data | ||||
| 	url = https://github.com/dpaulat/supercell-wx-test-data | ||||
|  |  | |||
							
								
								
									
										2
									
								
								external/aws-sdk-cpp
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/aws-sdk-cpp
									
										
									
									
										vendored
									
									
								
							|  | @ -1 +1 @@ | |||
| Subproject commit 9c95a05a5a99718965c033c6e1fc3f8bb34a1b83 | ||||
| Subproject commit 8d31e042f950fe70924391a205cceaf342ecec00 | ||||
							
								
								
									
										2
									
								
								external/cmake-conan
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/cmake-conan
									
										
									
									
										vendored
									
									
								
							|  | @ -1 +1 @@ | |||
| Subproject commit c22bbf0af0b73d5f0def24a9cdf4ce503ae79e5d | ||||
| Subproject commit b0e4d1ec08edb35ef31033938567d621f6643c17 | ||||
							
								
								
									
										2
									
								
								external/date
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/date
									
										
									
									
										vendored
									
									
								
							|  | @ -1 +1 @@ | |||
| Subproject commit ca5727855bd1bae12b2c6ca36cd88649d43ec862 | ||||
| Subproject commit a5db3aecec580bc78b6c01c118f2628676769b69 | ||||
|  | @ -89,8 +89,7 @@ | |||
| 
 | ||||
| //---- Use FreeType + plutosvg or lunasvg to render OpenType SVG fonts (SVGinOT)
 | ||||
| // Only works in combination with IMGUI_ENABLE_FREETYPE.
 | ||||
| // - lunasvg is currently easier to acquire/install, as e.g. it is part of vcpkg.
 | ||||
| // - plutosvg will support more fonts and may load them faster. It currently requires to be built manually but it is fairly easy. See misc/freetype/README for instructions.
 | ||||
| // - plutosvg is currently easier to install, as e.g. it is part of vcpkg. It will support more fonts and may load them faster. See misc/freetype/README for instructions.
 | ||||
| // - Both require headers to be available in the include path + program to be linked with the library code (not provided).
 | ||||
| // - (note: lunasvg implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement)
 | ||||
| //#define IMGUI_ENABLE_FREETYPE_PLUTOSVG
 | ||||
|  | @ -131,6 +130,10 @@ | |||
| //#define IM_DEBUG_BREAK  IM_ASSERT(0)
 | ||||
| //#define IM_DEBUG_BREAK  __debugbreak()
 | ||||
| 
 | ||||
| //---- Debug Tools: Enable highlight ID conflicts _before_ hovering items. When io.ConfigDebugHighlightIdConflicts is set.
 | ||||
| // (THIS WILL SLOW DOWN DEAR IMGUI. Only use occasionally and disable after use)
 | ||||
| //#define IMGUI_DEBUG_HIGHLIGHT_ALL_ID_CONFLICTS
 | ||||
| 
 | ||||
| //---- Debug Tools: Enable slower asserts
 | ||||
| //#define IMGUI_DEBUG_PARANOID
 | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										2
									
								
								external/maplibre-native-qt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/maplibre-native-qt
									
										
									
									
										vendored
									
									
								
							|  | @ -1 +1 @@ | |||
| Subproject commit 527734fdcacf8d85185776f4b020b94a8c937cdd | ||||
| Subproject commit 8b40697895c19da4479cd037a76608f4c36935e8 | ||||
							
								
								
									
										2
									
								
								external/stb
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/stb
									
										
									
									
										vendored
									
									
								
							|  | @ -1 +1 @@ | |||
| Subproject commit 5c205738c191bcb0abc65c4febfa9bd25ff35234 | ||||
| Subproject commit f58f558c120e9b32c217290b80bad1a0729fbb2c | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat