mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	Merge pull request #2369 from MerryMage/core-frontend
core: Move emu_window and key_map into core
This commit is contained in:
		
						commit
						51dd13b8a0
					
				
					 14 changed files with 16 additions and 16 deletions
				
			
		|  | @ -9,10 +9,10 @@ | ||||||
| #include <SDL.h> | #include <SDL.h> | ||||||
| #include <glad/glad.h> | #include <glad/glad.h> | ||||||
| #include "citra/emu_window/emu_window_sdl2.h" | #include "citra/emu_window/emu_window_sdl2.h" | ||||||
| #include "common/key_map.h" |  | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/scm_rev.h" | #include "common/scm_rev.h" | ||||||
| #include "common/string_util.h" | #include "common/string_util.h" | ||||||
|  | #include "core/frontend/key_map.h" | ||||||
| #include "core/hle/service/hid/hid.h" | #include "core/hle/service/hid/hid.h" | ||||||
| #include "core/settings.h" | #include "core/settings.h" | ||||||
| #include "video_core/video_core.h" | #include "video_core/video_core.h" | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <utility> | #include <utility> | ||||||
| #include "common/emu_window.h" | #include "core/frontend/emu_window.h" | ||||||
| 
 | 
 | ||||||
| struct SDL_Window; | struct SDL_Window; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -9,11 +9,11 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #include "citra_qt/bootmanager.h" | #include "citra_qt/bootmanager.h" | ||||||
| #include "common/key_map.h" |  | ||||||
| #include "common/microprofile.h" | #include "common/microprofile.h" | ||||||
| #include "common/scm_rev.h" | #include "common/scm_rev.h" | ||||||
| #include "common/string_util.h" | #include "common/string_util.h" | ||||||
| #include "core/core.h" | #include "core/core.h" | ||||||
|  | #include "core/frontend/key_map.h" | ||||||
| #include "video_core/debug_utils/debug_utils.h" | #include "video_core/debug_utils/debug_utils.h" | ||||||
| #include "video_core/video_core.h" | #include "video_core/video_core.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -9,8 +9,8 @@ | ||||||
| #include <mutex> | #include <mutex> | ||||||
| #include <QGLWidget> | #include <QGLWidget> | ||||||
| #include <QThread> | #include <QThread> | ||||||
| #include "common/emu_window.h" |  | ||||||
| #include "common/thread.h" | #include "common/thread.h" | ||||||
|  | #include "core/frontend/emu_window.h" | ||||||
| 
 | 
 | ||||||
| class QKeyEvent; | class QKeyEvent; | ||||||
| class QScreen; | class QScreen; | ||||||
|  |  | ||||||
|  | @ -3,11 +3,9 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOU | ||||||
| 
 | 
 | ||||||
| set(SRCS | set(SRCS | ||||||
|             break_points.cpp |             break_points.cpp | ||||||
|             emu_window.cpp |  | ||||||
|             file_util.cpp |             file_util.cpp | ||||||
|             framebuffer_layout.cpp |             framebuffer_layout.cpp | ||||||
|             hash.cpp |             hash.cpp | ||||||
|             key_map.cpp |  | ||||||
|             logging/filter.cpp |             logging/filter.cpp | ||||||
|             logging/text_formatter.cpp |             logging/text_formatter.cpp | ||||||
|             logging/backend.cpp |             logging/backend.cpp | ||||||
|  | @ -34,11 +32,9 @@ set(HEADERS | ||||||
|             common_funcs.h |             common_funcs.h | ||||||
|             common_paths.h |             common_paths.h | ||||||
|             common_types.h |             common_types.h | ||||||
|             emu_window.h |  | ||||||
|             file_util.h |             file_util.h | ||||||
|             framebuffer_layout.h |             framebuffer_layout.h | ||||||
|             hash.h |             hash.h | ||||||
|             key_map.h |  | ||||||
|             linear_disk_cache.h |             linear_disk_cache.h | ||||||
|             logging/text_formatter.h |             logging/text_formatter.h | ||||||
|             logging/filter.h |             logging/filter.h | ||||||
|  |  | ||||||
|  | @ -29,6 +29,8 @@ set(SRCS | ||||||
|             file_sys/ivfc_archive.cpp |             file_sys/ivfc_archive.cpp | ||||||
|             file_sys/path_parser.cpp |             file_sys/path_parser.cpp | ||||||
|             file_sys/savedata_archive.cpp |             file_sys/savedata_archive.cpp | ||||||
|  |             frontend/emu_window.cpp | ||||||
|  |             frontend/key_map.cpp | ||||||
|             gdbstub/gdbstub.cpp |             gdbstub/gdbstub.cpp | ||||||
|             hle/config_mem.cpp |             hle/config_mem.cpp | ||||||
|             hle/applets/applet.cpp |             hle/applets/applet.cpp | ||||||
|  | @ -198,6 +200,8 @@ set(HEADERS | ||||||
|             file_sys/ivfc_archive.h |             file_sys/ivfc_archive.h | ||||||
|             file_sys/path_parser.h |             file_sys/path_parser.h | ||||||
|             file_sys/savedata_archive.h |             file_sys/savedata_archive.h | ||||||
|  |             frontend/emu_window.h | ||||||
|  |             frontend/key_map.h | ||||||
|             gdbstub/gdbstub.h |             gdbstub/gdbstub.h | ||||||
|             hle/config_mem.h |             hle/config_mem.h | ||||||
|             hle/function_wrappers.h |             hle/function_wrappers.h | ||||||
|  |  | ||||||
|  | @ -5,8 +5,8 @@ | ||||||
| #include <algorithm> | #include <algorithm> | ||||||
| #include <cmath> | #include <cmath> | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| #include "common/key_map.h" | #include "core/frontend/emu_window.h" | ||||||
| #include "emu_window.h" | #include "core/frontend/key_map.h" | ||||||
| #include "video_core/video_core.h" | #include "video_core/video_core.h" | ||||||
| 
 | 
 | ||||||
| void EmuWindow::ButtonPressed(Service::HID::PadState pad) { | void EmuWindow::ButtonPressed(Service::HID::PadState pad) { | ||||||
|  | @ -3,8 +3,8 @@ | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
| #include <map> | #include <map> | ||||||
| #include "common/emu_window.h" | #include "core/frontend/emu_window.h" | ||||||
| #include "common/key_map.h" | #include "core/frontend/key_map.h" | ||||||
| 
 | 
 | ||||||
| namespace KeyMap { | namespace KeyMap { | ||||||
| 
 | 
 | ||||||
|  | @ -3,9 +3,9 @@ | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
| #include <cmath> | #include <cmath> | ||||||
| #include "common/emu_window.h" |  | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "core/core_timing.h" | #include "core/core_timing.h" | ||||||
|  | #include "core/frontend/emu_window.h" | ||||||
| #include "core/hle/kernel/event.h" | #include "core/hle/kernel/event.h" | ||||||
| #include "core/hle/kernel/shared_memory.h" | #include "core/hle/kernel/shared_memory.h" | ||||||
| #include "core/hle/service/hid/hid.h" | #include "core/hle/service/hid/hid.h" | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ | ||||||
| #include "settings.h" | #include "settings.h" | ||||||
| #include "video_core/video_core.h" | #include "video_core/video_core.h" | ||||||
| 
 | 
 | ||||||
| #include "common/emu_window.h" | #include "core/frontend/emu_window.h" | ||||||
| 
 | 
 | ||||||
| namespace Settings { | namespace Settings { | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -11,11 +11,11 @@ | ||||||
| #include <vector> | #include <vector> | ||||||
| #include <glad/glad.h> | #include <glad/glad.h> | ||||||
| #include "common/bit_field.h" | #include "common/bit_field.h" | ||||||
| #include "common/emu_window.h" |  | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/math_util.h" | #include "common/math_util.h" | ||||||
| #include "common/microprofile.h" | #include "common/microprofile.h" | ||||||
| #include "common/vector_math.h" | #include "common/vector_math.h" | ||||||
|  | #include "core/frontend/emu_window.h" | ||||||
| #include "core/memory.h" | #include "core/memory.h" | ||||||
| #include "video_core/debug_utils/debug_utils.h" | #include "video_core/debug_utils/debug_utils.h" | ||||||
| #include "video_core/pica_state.h" | #include "video_core/pica_state.h" | ||||||
|  |  | ||||||
|  | @ -9,10 +9,10 @@ | ||||||
| #include <glad/glad.h> | #include <glad/glad.h> | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| #include "common/bit_field.h" | #include "common/bit_field.h" | ||||||
| #include "common/emu_window.h" |  | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/profiler_reporting.h" | #include "common/profiler_reporting.h" | ||||||
| #include "common/synchronized_wrapper.h" | #include "common/synchronized_wrapper.h" | ||||||
|  | #include "core/frontend/emu_window.h" | ||||||
| #include "core/hw/gpu.h" | #include "core/hw/gpu.h" | ||||||
| #include "core/hw/hw.h" | #include "core/hw/hw.h" | ||||||
| #include "core/hw/lcd.h" | #include "core/hw/lcd.h" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue