mirror of
				https://github.com/N64Recomp/N64ModernRuntime.git
				synced 2025-10-30 08:02:29 +00:00 
			
		
		
		
	Use SDL_Window as the WindowHandle in Linux and Android. (#73)
This commit is contained in:
		
							parent
							
								
									576fed6cfc
								
							
						
					
					
						commit
						1361c48f59
					
				
					 1 changed files with 5 additions and 8 deletions
				
			
		|  | @ -23,6 +23,8 @@ | ||||||
| #include "ultra64.h" | #include "ultra64.h" | ||||||
| #include "config.hpp" | #include "config.hpp" | ||||||
| 
 | 
 | ||||||
|  | struct SDL_Window; | ||||||
|  | 
 | ||||||
| namespace ultramodern { | namespace ultramodern { | ||||||
|     namespace renderer { |     namespace renderer { | ||||||
| 
 | 
 | ||||||
|  | @ -33,14 +35,9 @@ namespace ultramodern { | ||||||
|             DWORD thread_id = (DWORD)-1; |             DWORD thread_id = (DWORD)-1; | ||||||
|             auto operator<=>(const WindowHandle&) const = default; |             auto operator<=>(const WindowHandle&) const = default; | ||||||
|         }; |         }; | ||||||
| #elif defined(__ANDROID__) | // TODO add a native window handle option here (Display/Window for x11 and ANativeWindow for Android) as a compile-time option.
 | ||||||
|         using WindowHandle = ANativeWindow*; | #elif defined(__linux__) || defined(__ANDROID__) | ||||||
| #elif defined(__linux__) |         using WindowHandle = SDL_Window*; | ||||||
|         struct WindowHandle { |  | ||||||
|             Display* display; |  | ||||||
|             Window window; |  | ||||||
|             auto operator<=>(const WindowHandle&) const = default; |  | ||||||
|         }; |  | ||||||
| #elif defined(__APPLE__) | #elif defined(__APPLE__) | ||||||
|         struct WindowHandle { |         struct WindowHandle { | ||||||
|             void* window; |             void* window; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Darío
						Darío