mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	xbyak: Correct xbyak include directory
xbyak is intended to be installed in /usr/local/include/xbyak. Since we desire not to install xbyak before using it, we copy the headers to the appropriate directory structure and use that instead Co-authored-by: merry <git@mary.rs>
This commit is contained in:
		
							parent
							
								
									726964ff20
								
							
						
					
					
						commit
						4a590d1fcb
					
				
					 4 changed files with 6 additions and 4 deletions
				
			
		
							
								
								
									
										4
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								externals/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -34,7 +34,9 @@ add_subdirectory(cryptopp) | |||
| # Xbyak | ||||
| if (ARCHITECTURE_x86_64) | ||||
|     add_library(xbyak INTERFACE) | ||||
|     target_include_directories(xbyak SYSTEM INTERFACE ./xbyak/xbyak) | ||||
|     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) | ||||
|     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) | ||||
|     target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include) | ||||
|     target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) | ||||
| endif() | ||||
| 
 | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ | |||
| 
 | ||||
| #include <bitset> | ||||
| #include <initializer_list> | ||||
| #include <xbyak.h> | ||||
| #include <xbyak/xbyak.h> | ||||
| #include "common/assert.h" | ||||
| 
 | ||||
| namespace Common::X64 { | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ | |||
| #pragma once | ||||
| 
 | ||||
| #include <type_traits> | ||||
| #include <xbyak.h> | ||||
| #include <xbyak/xbyak.h> | ||||
| #include "common/x64/xbyak_abi.h" | ||||
| 
 | ||||
| namespace Common::X64 { | ||||
|  |  | |||
|  | @ -11,7 +11,7 @@ | |||
| #include <utility> | ||||
| #include <vector> | ||||
| #include <nihstro/shader_bytecode.h> | ||||
| #include <xbyak.h> | ||||
| #include <xbyak/xbyak.h> | ||||
| #include "common/bit_set.h" | ||||
| #include "common/common_types.h" | ||||
| #include "video_core/shader/shader.h" | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue