diff options
Diffstat (limited to '')
-rw-r--r-- | src/yuzu/CMakeLists.txt (renamed from src/citra_qt/CMakeLists.txt) | 22 | ||||
-rw-r--r-- | src/yuzu/Info.plist (renamed from src/citra_qt/Info.plist) | 0 | ||||
-rw-r--r-- | src/yuzu/bootmanager.cpp (renamed from src/citra_qt/bootmanager.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/bootmanager.h (renamed from src/citra_qt/bootmanager.h) | 0 | ||||
-rw-r--r-- | src/yuzu/citra-qt.rc (renamed from src/citra_qt/citra-qt.rc) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/config.cpp (renamed from src/citra_qt/configuration/config.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/config.h (renamed from src/citra_qt/configuration/config.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure.ui (renamed from src/citra_qt/configuration/configure.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_audio.cpp (renamed from src/citra_qt/configuration/configure_audio.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_audio.h (renamed from src/citra_qt/configuration/configure_audio.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_audio.ui (renamed from src/citra_qt/configuration/configure_audio.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_debug.cpp (renamed from src/citra_qt/configuration/configure_debug.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_debug.h (renamed from src/citra_qt/configuration/configure_debug.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_debug.ui (renamed from src/citra_qt/configuration/configure_debug.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_dialog.cpp (renamed from src/citra_qt/configuration/configure_dialog.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_dialog.h (renamed from src/citra_qt/configuration/configure_dialog.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_general.cpp (renamed from src/citra_qt/configuration/configure_general.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_general.h (renamed from src/citra_qt/configuration/configure_general.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_general.ui (renamed from src/citra_qt/configuration/configure_general.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp (renamed from src/citra_qt/configuration/configure_graphics.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_graphics.h (renamed from src/citra_qt/configuration/configure_graphics.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_graphics.ui (renamed from src/citra_qt/configuration/configure_graphics.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_input.cpp (renamed from src/citra_qt/configuration/configure_input.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_input.h (renamed from src/citra_qt/configuration/configure_input.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_input.ui (renamed from src/citra_qt/configuration/configure_input.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_system.cpp (renamed from src/citra_qt/configuration/configure_system.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_system.h (renamed from src/citra_qt/configuration/configure_system.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_system.ui (renamed from src/citra_qt/configuration/configure_system.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_web.cpp (renamed from src/citra_qt/configuration/configure_web.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_web.h (renamed from src/citra_qt/configuration/configure_web.h) | 0 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_web.ui (renamed from src/citra_qt/configuration/configure_web.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics.cpp (renamed from src/citra_qt/debugger/graphics/graphics.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics.h (renamed from src/citra_qt/debugger/graphics/graphics.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_breakpoint_observer.cpp (renamed from src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_breakpoint_observer.h (renamed from src/citra_qt/debugger/graphics/graphics_breakpoint_observer.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_breakpoints.cpp (renamed from src/citra_qt/debugger/graphics/graphics_breakpoints.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_breakpoints.h (renamed from src/citra_qt/debugger/graphics/graphics_breakpoints.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_breakpoints_p.h (renamed from src/citra_qt/debugger/graphics/graphics_breakpoints_p.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_cmdlists.cpp (renamed from src/citra_qt/debugger/graphics/graphics_cmdlists.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_cmdlists.h (renamed from src/citra_qt/debugger/graphics/graphics_cmdlists.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_surface.cpp (renamed from src/citra_qt/debugger/graphics/graphics_surface.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_surface.h (renamed from src/citra_qt/debugger/graphics/graphics_surface.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_tracing.cpp (renamed from src/citra_qt/debugger/graphics/graphics_tracing.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_tracing.h (renamed from src/citra_qt/debugger/graphics/graphics_tracing.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_vertex_shader.cpp (renamed from src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/graphics/graphics_vertex_shader.h (renamed from src/citra_qt/debugger/graphics/graphics_vertex_shader.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/profiler.cpp (renamed from src/citra_qt/debugger/profiler.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/profiler.h (renamed from src/citra_qt/debugger/profiler.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/registers.cpp (renamed from src/citra_qt/debugger/registers.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/registers.h (renamed from src/citra_qt/debugger/registers.h) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/registers.ui (renamed from src/citra_qt/debugger/registers.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/wait_tree.cpp (renamed from src/citra_qt/debugger/wait_tree.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/debugger/wait_tree.h (renamed from src/citra_qt/debugger/wait_tree.h) | 0 | ||||
-rw-r--r-- | src/yuzu/game_list.cpp (renamed from src/citra_qt/game_list.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/game_list.h (renamed from src/citra_qt/game_list.h) | 0 | ||||
-rw-r--r-- | src/yuzu/game_list_p.h (renamed from src/citra_qt/game_list_p.h) | 0 | ||||
-rw-r--r-- | src/yuzu/hotkeys.cpp (renamed from src/citra_qt/hotkeys.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/hotkeys.h (renamed from src/citra_qt/hotkeys.h) | 0 | ||||
-rw-r--r-- | src/yuzu/hotkeys.ui (renamed from src/citra_qt/hotkeys.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/main.cpp (renamed from src/citra_qt/main.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/main.h (renamed from src/citra_qt/main.h) | 0 | ||||
-rw-r--r-- | src/yuzu/main.ui (renamed from src/citra_qt/main.ui) | 0 | ||||
-rw-r--r-- | src/yuzu/ui_settings.cpp (renamed from src/citra_qt/ui_settings.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/ui_settings.h (renamed from src/citra_qt/ui_settings.h) | 0 | ||||
-rw-r--r-- | src/yuzu/util/spinbox.cpp (renamed from src/citra_qt/util/spinbox.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/util/spinbox.h (renamed from src/citra_qt/util/spinbox.h) | 0 | ||||
-rw-r--r-- | src/yuzu/util/util.cpp (renamed from src/citra_qt/util/util.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu/util/util.h (renamed from src/citra_qt/util/util.h) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/CMakeLists.txt (renamed from src/citra/CMakeLists.txt) | 16 | ||||
-rw-r--r-- | src/yuzu_cmd/citra.cpp (renamed from src/citra/citra.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/citra.rc (renamed from src/citra/citra.rc) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/config.cpp (renamed from src/citra/config.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/config.h (renamed from src/citra/config.h) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/default_ini.h (renamed from src/citra/default_ini.h) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp (renamed from src/citra/emu_window/emu_window_sdl2.cpp) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.h (renamed from src/citra/emu_window/emu_window_sdl2.h) | 0 | ||||
-rw-r--r-- | src/yuzu_cmd/resource.h (renamed from src/citra/resource.h) | 0 |
77 files changed, 19 insertions, 19 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/yuzu/CMakeLists.txt index e2fa33081..38bbc0043 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -79,7 +79,7 @@ set(UIS main.ui ) -file(GLOB_RECURSE ICONS ${CMAKE_SOURCE_DIR}/dist/icons/*) +# file(GLOB_RECURSE ICONS ${CMAKE_SOURCE_DIR}/dist/icons/*) file(GLOB_RECURSE THEMES ${CMAKE_SOURCE_DIR}/dist/qt_themes/*) create_directory_groups(${SRCS} ${HEADERS} ${UIS}) @@ -93,24 +93,24 @@ endif() if (APPLE) set(MACOSX_ICON "../../dist/citra.icns") set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${ICONS} ${THEMES} ${MACOSX_ICON}) - set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) + add_executable(yuzu MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON}) + set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) else() - add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS} ${ICONS} ${THEMES}) + add_executable(yuzu ${SRCS} ${HEADERS} ${UI_HDRS}) endif() -target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core) -target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::OpenGL Qt5::Widgets) -target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) +target_link_libraries(yuzu PRIVATE common core input_common video_core) +target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets) +target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) if(UNIX AND NOT APPLE) - install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + install(TARGETS yuzu RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() if (MSVC) include(CopyCitraQt5Deps) include(CopyCitraSDLDeps) include(CopyYuzuUnicornDeps) - copy_citra_Qt5_deps(citra-qt) - copy_citra_SDL_deps(citra-qt) - copy_yuzu_unicorn_deps(citra-qt) + copy_citra_Qt5_deps(yuzu) + copy_citra_SDL_deps(yuzu) + copy_yuzu_unicorn_deps(yuzu) endif() diff --git a/src/citra_qt/Info.plist b/src/yuzu/Info.plist index 7d46b39d1..7d46b39d1 100644 --- a/src/citra_qt/Info.plist +++ b/src/yuzu/Info.plist diff --git a/src/citra_qt/bootmanager.cpp b/src/yuzu/bootmanager.cpp index eb542ad4e..eb542ad4e 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp diff --git a/src/citra_qt/bootmanager.h b/src/yuzu/bootmanager.h index 6974edcbb..6974edcbb 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/yuzu/bootmanager.h diff --git a/src/citra_qt/citra-qt.rc b/src/yuzu/citra-qt.rc index a48a9440d..a48a9440d 100644 --- a/src/citra_qt/citra-qt.rc +++ b/src/yuzu/citra-qt.rc diff --git a/src/citra_qt/configuration/config.cpp b/src/yuzu/configuration/config.cpp index fd884db7a..fd884db7a 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp diff --git a/src/citra_qt/configuration/config.h b/src/yuzu/configuration/config.h index cbf745ea2..cbf745ea2 100644 --- a/src/citra_qt/configuration/config.h +++ b/src/yuzu/configuration/config.h diff --git a/src/citra_qt/configuration/configure.ui b/src/yuzu/configuration/configure.ui index 6abd1917e..6abd1917e 100644 --- a/src/citra_qt/configuration/configure.ui +++ b/src/yuzu/configuration/configure.ui diff --git a/src/citra_qt/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index 3fd1d127a..3fd1d127a 100644 --- a/src/citra_qt/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp diff --git a/src/citra_qt/configuration/configure_audio.h b/src/yuzu/configuration/configure_audio.h index 8190e694f..8190e694f 100644 --- a/src/citra_qt/configuration/configure_audio.h +++ b/src/yuzu/configuration/configure_audio.h diff --git a/src/citra_qt/configuration/configure_audio.ui b/src/yuzu/configuration/configure_audio.ui index dd870eb61..dd870eb61 100644 --- a/src/citra_qt/configuration/configure_audio.ui +++ b/src/yuzu/configuration/configure_audio.ui diff --git a/src/citra_qt/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index 263f73f38..263f73f38 100644 --- a/src/citra_qt/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp diff --git a/src/citra_qt/configuration/configure_debug.h b/src/yuzu/configuration/configure_debug.h index d167eb996..d167eb996 100644 --- a/src/citra_qt/configuration/configure_debug.h +++ b/src/yuzu/configuration/configure_debug.h diff --git a/src/citra_qt/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 96638ebdb..96638ebdb 100644 --- a/src/citra_qt/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui diff --git a/src/citra_qt/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index b87dc0e6c..b87dc0e6c 100644 --- a/src/citra_qt/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp diff --git a/src/citra_qt/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h index 21fa1f501..21fa1f501 100644 --- a/src/citra_qt/configuration/configure_dialog.h +++ b/src/yuzu/configuration/configure_dialog.h diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 0de27aa8b..0de27aa8b 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp diff --git a/src/citra_qt/configuration/configure_general.h b/src/yuzu/configuration/configure_general.h index 447552d8c..447552d8c 100644 --- a/src/citra_qt/configuration/configure_general.h +++ b/src/yuzu/configuration/configure_general.h diff --git a/src/citra_qt/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index e88c37936..e88c37936 100644 --- a/src/citra_qt/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui diff --git a/src/citra_qt/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index b5a5ab1e1..b5a5ab1e1 100644 --- a/src/citra_qt/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp diff --git a/src/citra_qt/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h index 5497a55f7..5497a55f7 100644 --- a/src/citra_qt/configuration/configure_graphics.h +++ b/src/yuzu/configuration/configure_graphics.h diff --git a/src/citra_qt/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 5667b14b6..5667b14b6 100644 --- a/src/citra_qt/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 116a6330f..116a6330f 100644 --- a/src/citra_qt/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp diff --git a/src/citra_qt/configuration/configure_input.h b/src/yuzu/configuration/configure_input.h index c950fbcb4..c950fbcb4 100644 --- a/src/citra_qt/configuration/configure_input.h +++ b/src/yuzu/configuration/configure_input.h diff --git a/src/citra_qt/configuration/configure_input.ui b/src/yuzu/configuration/configure_input.ui index 2760787e5..2760787e5 100644 --- a/src/citra_qt/configuration/configure_input.ui +++ b/src/yuzu/configuration/configure_input.ui diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index d83c2db23..d83c2db23 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp diff --git a/src/citra_qt/configuration/configure_system.h b/src/yuzu/configuration/configure_system.h index f13de17d4..f13de17d4 100644 --- a/src/citra_qt/configuration/configure_system.h +++ b/src/yuzu/configuration/configure_system.h diff --git a/src/citra_qt/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui index 8caf49623..8caf49623 100644 --- a/src/citra_qt/configuration/configure_system.ui +++ b/src/yuzu/configuration/configure_system.ui diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cpp index bf8c21ac7..bf8c21ac7 100644 --- a/src/citra_qt/configuration/configure_web.cpp +++ b/src/yuzu/configuration/configure_web.cpp diff --git a/src/citra_qt/configuration/configure_web.h b/src/yuzu/configuration/configure_web.h index ad2d58f6e..ad2d58f6e 100644 --- a/src/citra_qt/configuration/configure_web.h +++ b/src/yuzu/configuration/configure_web.h diff --git a/src/citra_qt/configuration/configure_web.ui b/src/yuzu/configuration/configure_web.ui index dd996ab62..dd996ab62 100644 --- a/src/citra_qt/configuration/configure_web.ui +++ b/src/yuzu/configuration/configure_web.ui diff --git a/src/citra_qt/debugger/graphics/graphics.cpp b/src/yuzu/debugger/graphics/graphics.cpp index 8154363a2..8154363a2 100644 --- a/src/citra_qt/debugger/graphics/graphics.cpp +++ b/src/yuzu/debugger/graphics/graphics.cpp diff --git a/src/citra_qt/debugger/graphics/graphics.h b/src/yuzu/debugger/graphics/graphics.h index 8837fb792..8837fb792 100644 --- a/src/citra_qt/debugger/graphics/graphics.h +++ b/src/yuzu/debugger/graphics/graphics.h diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp b/src/yuzu/debugger/graphics/graphics_breakpoint_observer.cpp index dc6070dea..dc6070dea 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp +++ b/src/yuzu/debugger/graphics/graphics_breakpoint_observer.cpp diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoint_observer.h b/src/yuzu/debugger/graphics/graphics_breakpoint_observer.h index e77df4f5b..e77df4f5b 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoint_observer.h +++ b/src/yuzu/debugger/graphics/graphics_breakpoint_observer.h diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp b/src/yuzu/debugger/graphics/graphics_breakpoints.cpp index 030828ba8..030828ba8 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp +++ b/src/yuzu/debugger/graphics/graphics_breakpoints.cpp diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoints.h b/src/yuzu/debugger/graphics/graphics_breakpoints.h index bec72a2db..bec72a2db 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoints.h +++ b/src/yuzu/debugger/graphics/graphics_breakpoints.h diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoints_p.h b/src/yuzu/debugger/graphics/graphics_breakpoints_p.h index dc64706bd..dc64706bd 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoints_p.h +++ b/src/yuzu/debugger/graphics/graphics_breakpoints_p.h diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp b/src/yuzu/debugger/graphics/graphics_cmdlists.cpp index ce2b9fa50..ce2b9fa50 100644 --- a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp +++ b/src/yuzu/debugger/graphics/graphics_cmdlists.cpp diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.h b/src/yuzu/debugger/graphics/graphics_cmdlists.h index 8f40b94c5..8f40b94c5 100644 --- a/src/citra_qt/debugger/graphics/graphics_cmdlists.h +++ b/src/yuzu/debugger/graphics/graphics_cmdlists.h diff --git a/src/citra_qt/debugger/graphics/graphics_surface.cpp b/src/yuzu/debugger/graphics/graphics_surface.cpp index c974545ef..c974545ef 100644 --- a/src/citra_qt/debugger/graphics/graphics_surface.cpp +++ b/src/yuzu/debugger/graphics/graphics_surface.cpp diff --git a/src/citra_qt/debugger/graphics/graphics_surface.h b/src/yuzu/debugger/graphics/graphics_surface.h index 28f5650a7..28f5650a7 100644 --- a/src/citra_qt/debugger/graphics/graphics_surface.h +++ b/src/yuzu/debugger/graphics/graphics_surface.h diff --git a/src/citra_qt/debugger/graphics/graphics_tracing.cpp b/src/yuzu/debugger/graphics/graphics_tracing.cpp index 40d5bed51..40d5bed51 100644 --- a/src/citra_qt/debugger/graphics/graphics_tracing.cpp +++ b/src/yuzu/debugger/graphics/graphics_tracing.cpp diff --git a/src/citra_qt/debugger/graphics/graphics_tracing.h b/src/yuzu/debugger/graphics/graphics_tracing.h index eb1292c29..eb1292c29 100644 --- a/src/citra_qt/debugger/graphics/graphics_tracing.h +++ b/src/yuzu/debugger/graphics/graphics_tracing.h diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp b/src/yuzu/debugger/graphics/graphics_vertex_shader.cpp index 7f4ec0c52..7f4ec0c52 100644 --- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp +++ b/src/yuzu/debugger/graphics/graphics_vertex_shader.cpp diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.h b/src/yuzu/debugger/graphics/graphics_vertex_shader.h index c249a2ff8..c249a2ff8 100644 --- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.h +++ b/src/yuzu/debugger/graphics/graphics_vertex_shader.h diff --git a/src/citra_qt/debugger/profiler.cpp b/src/yuzu/debugger/profiler.cpp index f060bbe08..f060bbe08 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/yuzu/debugger/profiler.cpp diff --git a/src/citra_qt/debugger/profiler.h b/src/yuzu/debugger/profiler.h index eae1e9e3c..eae1e9e3c 100644 --- a/src/citra_qt/debugger/profiler.h +++ b/src/yuzu/debugger/profiler.h diff --git a/src/citra_qt/debugger/registers.cpp b/src/yuzu/debugger/registers.cpp index f9345c9f6..f9345c9f6 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/yuzu/debugger/registers.cpp diff --git a/src/citra_qt/debugger/registers.h b/src/yuzu/debugger/registers.h index 55bda5b59..55bda5b59 100644 --- a/src/citra_qt/debugger/registers.h +++ b/src/yuzu/debugger/registers.h diff --git a/src/citra_qt/debugger/registers.ui b/src/yuzu/debugger/registers.ui index c81ae03f9..c81ae03f9 100644 --- a/src/citra_qt/debugger/registers.ui +++ b/src/yuzu/debugger/registers.ui diff --git a/src/citra_qt/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index eefbcb9f1..eefbcb9f1 100644 --- a/src/citra_qt/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp diff --git a/src/citra_qt/debugger/wait_tree.h b/src/yuzu/debugger/wait_tree.h index 4034e909b..4034e909b 100644 --- a/src/citra_qt/debugger/wait_tree.h +++ b/src/yuzu/debugger/wait_tree.h diff --git a/src/citra_qt/game_list.cpp b/src/yuzu/game_list.cpp index a8e3541cd..a8e3541cd 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/yuzu/game_list.cpp diff --git a/src/citra_qt/game_list.h b/src/yuzu/game_list.h index 4823a1296..4823a1296 100644 --- a/src/citra_qt/game_list.h +++ b/src/yuzu/game_list.h diff --git a/src/citra_qt/game_list_p.h b/src/yuzu/game_list_p.h index 9881296d9..9881296d9 100644 --- a/src/citra_qt/game_list_p.h +++ b/src/yuzu/game_list_p.h diff --git a/src/citra_qt/hotkeys.cpp b/src/yuzu/hotkeys.cpp index 158ed506f..158ed506f 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/yuzu/hotkeys.cpp diff --git a/src/citra_qt/hotkeys.h b/src/yuzu/hotkeys.h index a4ccc193b..a4ccc193b 100644 --- a/src/citra_qt/hotkeys.h +++ b/src/yuzu/hotkeys.h diff --git a/src/citra_qt/hotkeys.ui b/src/yuzu/hotkeys.ui index 050fe064e..050fe064e 100644 --- a/src/citra_qt/hotkeys.ui +++ b/src/yuzu/hotkeys.ui diff --git a/src/citra_qt/main.cpp b/src/yuzu/main.cpp index 943aee30d..943aee30d 100644 --- a/src/citra_qt/main.cpp +++ b/src/yuzu/main.cpp diff --git a/src/citra_qt/main.h b/src/yuzu/main.h index d59a6d67d..d59a6d67d 100644 --- a/src/citra_qt/main.h +++ b/src/yuzu/main.h diff --git a/src/citra_qt/main.ui b/src/yuzu/main.ui index b13d578f5..b13d578f5 100644 --- a/src/citra_qt/main.ui +++ b/src/yuzu/main.ui diff --git a/src/citra_qt/ui_settings.cpp b/src/yuzu/ui_settings.cpp index 120b34990..120b34990 100644 --- a/src/citra_qt/ui_settings.cpp +++ b/src/yuzu/ui_settings.cpp diff --git a/src/citra_qt/ui_settings.h b/src/yuzu/ui_settings.h index d85c92765..d85c92765 100644 --- a/src/citra_qt/ui_settings.h +++ b/src/yuzu/ui_settings.h diff --git a/src/citra_qt/util/spinbox.cpp b/src/yuzu/util/spinbox.cpp index 212709007..212709007 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/yuzu/util/spinbox.cpp diff --git a/src/citra_qt/util/spinbox.h b/src/yuzu/util/spinbox.h index 2fa1db3a4..2fa1db3a4 100644 --- a/src/citra_qt/util/spinbox.h +++ b/src/yuzu/util/spinbox.h diff --git a/src/citra_qt/util/util.cpp b/src/yuzu/util/util.cpp index 02be92bbd..02be92bbd 100644 --- a/src/citra_qt/util/util.cpp +++ b/src/yuzu/util/util.cpp diff --git a/src/citra_qt/util/util.h b/src/yuzu/util/util.h index ab443ef9b..ab443ef9b 100644 --- a/src/citra_qt/util/util.h +++ b/src/yuzu/util/util.h diff --git a/src/citra/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index ed92a6ae2..c6c527eb6 100644 --- a/src/citra/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt @@ -15,21 +15,21 @@ set(HEADERS create_directory_groups(${SRCS} ${HEADERS}) -add_executable(citra ${SRCS} ${HEADERS}) -target_link_libraries(citra PRIVATE common core input_common network) -target_link_libraries(citra PRIVATE inih glad) +add_executable(yuzu-cmd ${SRCS} ${HEADERS}) +target_link_libraries(yuzu-cmd PRIVATE common core input_common) +target_link_libraries(yuzu-cmd PRIVATE inih glad) if (MSVC) - target_link_libraries(citra PRIVATE getopt) + target_link_libraries(yuzu-cmd PRIVATE getopt) endif() -target_link_libraries(citra PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads) +target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads) if(UNIX AND NOT APPLE) - install(TARGETS citra RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + install(TARGETS yuzu-cmd RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() if (MSVC) include(CopyCitraSDLDeps) include(CopyYuzuUnicornDeps) - copy_citra_SDL_deps(citra) - copy_yuzu_unicorn_deps(citra) + copy_citra_SDL_deps(yuzu-cmd) + copy_yuzu_unicorn_deps(yuzu-cmd) endif() diff --git a/src/citra/citra.cpp b/src/yuzu_cmd/citra.cpp index e524c5535..e524c5535 100644 --- a/src/citra/citra.cpp +++ b/src/yuzu_cmd/citra.cpp diff --git a/src/citra/citra.rc b/src/yuzu_cmd/citra.rc index c490ef302..c490ef302 100644 --- a/src/citra/citra.rc +++ b/src/yuzu_cmd/citra.rc diff --git a/src/citra/config.cpp b/src/yuzu_cmd/config.cpp index 94d1a9f1c..94d1a9f1c 100644 --- a/src/citra/config.cpp +++ b/src/yuzu_cmd/config.cpp diff --git a/src/citra/config.h b/src/yuzu_cmd/config.h index abc90f642..abc90f642 100644 --- a/src/citra/config.h +++ b/src/yuzu_cmd/config.h diff --git a/src/citra/default_ini.h b/src/yuzu_cmd/default_ini.h index b7b8abe1e..b7b8abe1e 100644 --- a/src/citra/default_ini.h +++ b/src/yuzu_cmd/default_ini.h diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index e65b04e4b..e65b04e4b 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h index 3664d2fbe..3664d2fbe 100644 --- a/src/citra/emu_window/emu_window_sdl2.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h diff --git a/src/citra/resource.h b/src/yuzu_cmd/resource.h index df8e459e4..df8e459e4 100644 --- a/src/citra/resource.h +++ b/src/yuzu_cmd/resource.h |