mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	externals: point to upstream dynarmic
This commit is contained in:
		
							parent
							
								
									21fe65c29c
								
							
						
					
					
						commit
						0e325255f3
					
				
					 3 changed files with 3 additions and 3 deletions
				
			
		
							
								
								
									
										2
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitmodules
									
										
									
									
										vendored
									
									
								
							|  | @ -12,7 +12,7 @@ | ||||||
|     url = https://github.com/catchorg/Catch2 |     url = https://github.com/catchorg/Catch2 | ||||||
| [submodule "dynarmic"] | [submodule "dynarmic"] | ||||||
|     path = externals/dynarmic |     path = externals/dynarmic | ||||||
|     url = https://github.com/citra-emu/dynarmic.git |     url = https://github.com/merryhime/dynarmic.git | ||||||
| [submodule "xbyak"] | [submodule "xbyak"] | ||||||
|     path = externals/xbyak |     path = externals/xbyak | ||||||
|     url = https://github.com/herumi/xbyak.git |     url = https://github.com/herumi/xbyak.git | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -33,6 +33,7 @@ add_subdirectory(cryptopp) | ||||||
| 
 | 
 | ||||||
| # fmt and Xbyak need to be added before dynarmic | # fmt and Xbyak need to be added before dynarmic | ||||||
| # libfmt | # libfmt | ||||||
|  | option(FMT_INSTALL "" ON) | ||||||
| add_subdirectory(fmt) | add_subdirectory(fmt) | ||||||
| 
 | 
 | ||||||
| # Xbyak | # Xbyak | ||||||
|  | @ -43,7 +44,6 @@ endif() | ||||||
| # Dynarmic | # Dynarmic | ||||||
| if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) | if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) | ||||||
|     set(DYNARMIC_TESTS OFF) |     set(DYNARMIC_TESTS OFF) | ||||||
|     set(DYNARMIC_NO_BUNDLED_FMT ON) |  | ||||||
|     set(DYNARMIC_FRONTENDS "A32") |     set(DYNARMIC_FRONTENDS "A32") | ||||||
|     add_subdirectory(dynarmic) |     add_subdirectory(dynarmic) | ||||||
| endif() | endif() | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								externals/dynarmic
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								externals/dynarmic
									
										
									
									
										vendored
									
									
								
							|  | @ -1 +1 @@ | ||||||
| Subproject commit 7a926d689bcc1cc39dd26d5bba379dffcc6815a3 | Subproject commit cd2bee17f20d8ec1df09f458c0f75114b65ed470 | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue