mirror of
				https://github.com/Zelda64Recomp/Zelda64Recomp.git
				synced 2025-10-30 08:03:03 +00:00 
			
		
		
		
	Add freetype binary git submodule to replace vcpkg
This commit is contained in:
		
							parent
							
								
									a8e6cd112e
								
							
						
					
					
						commit
						92a95eecc7
					
				
					 6 changed files with 7 additions and 22 deletions
				
			
		
							
								
								
									
										3
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							|  | @ -7,3 +7,6 @@ | |||
| [submodule "lib/RT64-HLE"] | ||||
| 	path = lib/RT64-HLE | ||||
| 	url = https://github.com/DarioSamo/RT64-HLE/ | ||||
| [submodule "lib/freetype-windows-binaries"] | ||||
| 	path = lib/freetype-windows-binaries | ||||
| 	url = https://github.com/ubawurinna/freetype-windows-binaries | ||||
|  |  | |||
|  | @ -13,7 +13,7 @@ endif() | |||
| set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) | ||||
| set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) | ||||
| 
 | ||||
| find_package(Freetype REQUIRED) | ||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/") | ||||
| 
 | ||||
| add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RT64-HLE ${CMAKE_BINARY_DIR}/rt64) | ||||
| add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi) | ||||
|  | @ -149,7 +149,6 @@ target_link_libraries(MMRecomp PRIVATE | |||
|     RecompiledFuncs | ||||
|     SDL2 | ||||
|     rt64 | ||||
|     Freetype::Freetype | ||||
|     RmlCore | ||||
|     RmlDebugger | ||||
|     nfd | ||||
|  |  | |||
							
								
								
									
										2
									
								
								lib/FindFreetype.cmake
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								lib/FindFreetype.cmake
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,2 @@ | |||
| set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include) | ||||
| set(FREETYPE_LIBRARIES "${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/release static/vs2015-2022/win64/freetype.lib") | ||||
							
								
								
									
										1
									
								
								lib/freetype-windows-binaries
									
										
									
									
									
										Submodule
									
								
							
							
						
						
									
										1
									
								
								lib/freetype-windows-binaries
									
										
									
									
									
										Submodule
									
								
							|  | @ -0,0 +1 @@ | |||
| Subproject commit d6fb49d11a9d0011bf4ecfe7e570beaaa189838a | ||||
|  | @ -1,14 +0,0 @@ | |||
| { | ||||
|   "default-registry": { | ||||
|     "kind": "git", | ||||
|     "baseline": "84df5613f71eda8a73ab08dc3041f3af7103a5b2", | ||||
|     "repository": "https://github.com/microsoft/vcpkg" | ||||
|   }, | ||||
|   "registries": [ | ||||
|     { | ||||
|       "kind": "artifact", | ||||
|       "location": "https://aka.ms/vcpkg-ce-default", | ||||
|       "name": "microsoft" | ||||
|     } | ||||
|   ] | ||||
| } | ||||
|  | @ -1,6 +0,0 @@ | |||
| { | ||||
|     "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", | ||||
|     "dependencies": [ | ||||
|         "freetype" | ||||
|     ] | ||||
| } | ||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Mr-Wiseguy
						Mr-Wiseguy