diff --git a/CMakeLists.txt b/CMakeLists.txt index 263d0b776..37cb26dd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -734,7 +734,7 @@ if(USE_DISCORD AND NOT LIBRETRO) target_include_directories(${PROJECT_NAME} PRIVATE core/deps/discord-rpc/include) target_link_libraries(${PROJECT_NAME} PRIVATE discord-rpc) target_compile_definitions(${PROJECT_NAME} PRIVATE USE_DISCORD) - target_sources(${PROJECT_NAME} PRIVATE core/rend/discord.cpp) + target_sources(${PROJECT_NAME} PRIVATE core/ui/discord.cpp) endif() cmrc_add_resource_library(flycast-resources ALIAS flycast::res NAMESPACE flycast) @@ -1292,26 +1292,26 @@ target_sources(${PROJECT_NAME} PRIVATE core/rend/norend/norend.cpp) if(NOT LIBRETRO) target_sources(${PROJECT_NAME} PRIVATE - core/rend/game_scanner.h - core/rend/imgui_driver.cpp - core/rend/imgui_driver.h - core/rend/gui.cpp - core/rend/gui.h - core/rend/gui_achievements.cpp - core/rend/gui_android.cpp - core/rend/gui_android.h - core/rend/gui_chat.h - core/rend/gui_cheats.cpp - core/rend/gui_util.cpp - core/rend/gui_util.h - core/rend/mainui.cpp - core/rend/mainui.h - core/rend/boxart/boxart.cpp - core/rend/boxart/boxart.h - core/rend/boxart/gamesdb.cpp - core/rend/boxart/gamesdb.h - core/rend/boxart/scraper.cpp - core/rend/boxart/scraper.h) + core/ui/game_scanner.h + core/ui/imgui_driver.cpp + core/ui/imgui_driver.h + core/ui/gui.cpp + core/ui/gui.h + core/ui/gui_achievements.cpp + core/ui/gui_android.cpp + core/ui/gui_android.h + core/ui/gui_chat.h + core/ui/gui_cheats.cpp + core/ui/gui_util.cpp + core/ui/gui_util.h + core/ui/mainui.cpp + core/ui/mainui.h + core/ui/boxart/boxart.cpp + core/ui/boxart/boxart.h + core/ui/boxart/gamesdb.cpp + core/ui/boxart/gamesdb.h + core/ui/boxart/scraper.cpp + core/ui/boxart/scraper.h) endif() if(USE_VULKAN) diff --git a/core/achievements/achievements.cpp b/core/achievements/achievements.cpp index e5db54f7c..264bdf81a 100644 --- a/core/achievements/achievements.cpp +++ b/core/achievements/achievements.cpp @@ -23,7 +23,7 @@ #include "oslib/directory.h" #include "oslib/http_client.h" #include "hw/sh4/sh4_mem.h" -#include "rend/gui_achievements.h" +#include "ui/gui_achievements.h" #include "imgread/common.h" #include "cfg/option.h" #include "oslib/oslib.h" diff --git a/core/emulator.cpp b/core/emulator.cpp index acb7c9b10..9af7f6f5b 100644 --- a/core/emulator.cpp +++ b/core/emulator.cpp @@ -37,7 +37,7 @@ #include "network/ggpo.h" #include "hw/mem/mem_watch.h" #include "network/net_handshake.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "network/naomi_network.h" #include "serialize.h" #include "hw/pvr/pvr.h" diff --git a/core/hw/maple/maple_devs.cpp b/core/hw/maple/maple_devs.cpp index 7b63d615e..a0bba1b55 100755 --- a/core/hw/maple/maple_devs.cpp +++ b/core/hw/maple/maple_devs.cpp @@ -7,7 +7,7 @@ #include "oslib/oslib.h" #include "hw/aica/sgc_if.h" #include "cfg/option.h" -#include "rend/gui.h" +#include "ui/gui.h" #include #include #include diff --git a/core/hw/naomi/card_reader.cpp b/core/hw/naomi/card_reader.cpp index b914c39a7..0877dee27 100644 --- a/core/hw/naomi/card_reader.cpp +++ b/core/hw/naomi/card_reader.cpp @@ -21,7 +21,7 @@ #include "hw/sh4/modules/modules.h" #include "hw/maple/maple_cfg.h" #include "hw/maple/maple_devs.h" -#include "rend/gui.h" +#include "ui/gui.h" #include #include #include diff --git a/core/hw/naomi/naomi.cpp b/core/hw/naomi/naomi.cpp index 36b705eb0..6c4bbafd4 100644 --- a/core/hw/naomi/naomi.cpp +++ b/core/hw/naomi/naomi.cpp @@ -30,7 +30,7 @@ #include "serialize.h" #include "network/output.h" #include "hw/sh4/modules/modules.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "printer.h" #include "hw/flashrom/x76f100.h" diff --git a/core/hw/naomi/naomi_m3comm.cpp b/core/hw/naomi/naomi_m3comm.cpp index cd53bdb92..b6027238a 100644 --- a/core/hw/naomi/naomi_m3comm.cpp +++ b/core/hw/naomi/naomi_m3comm.cpp @@ -30,7 +30,7 @@ #include "hw/sh4/sh4_mem.h" #include "network/naomi_network.h" #include "emulator.h" -#include "rend/gui.h" +#include "ui/gui.h" #include #include diff --git a/core/hw/naomi/printer.cpp b/core/hw/naomi/printer.cpp index 29eb0db81..ffb8e492b 100644 --- a/core/hw/naomi/printer.cpp +++ b/core/hw/naomi/printer.cpp @@ -20,7 +20,7 @@ #include "stdclass.h" #include "printer.h" #include "serialize.h" -#include "rend/gui.h" +#include "ui/gui.h" #include #include #include diff --git a/core/input/gamepad_device.cpp b/core/input/gamepad_device.cpp index 702fcbc65..610ef5b85 100644 --- a/core/input/gamepad_device.cpp +++ b/core/input/gamepad_device.cpp @@ -20,7 +20,7 @@ #include "gamepad_device.h" #include "cfg/cfg.h" #include "stdclass.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "emulator.h" #include "hw/maple/maple_devs.h" #include "mouse.h" diff --git a/core/input/keyboard_device.h b/core/input/keyboard_device.h index c6cbb5d29..1ae17ce35 100644 --- a/core/input/keyboard_device.h +++ b/core/input/keyboard_device.h @@ -20,7 +20,7 @@ #include "types.h" #include "cfg/option.h" #include "gamepad_device.h" -#include "rend/gui.h" +#include "ui/gui.h" #include extern u8 kb_key[4][6]; // normal keys pressed diff --git a/core/input/mouse.cpp b/core/input/mouse.cpp index 6e171e512..7efdf933f 100644 --- a/core/input/mouse.cpp +++ b/core/input/mouse.cpp @@ -18,7 +18,7 @@ */ #include "mouse.h" #include "cfg/option.h" -#include "rend/gui.h" +#include "ui/gui.h" // Mouse buttons // bit 0: Button C diff --git a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp index 26f19aaf1..83a18bc76 100644 --- a/core/linux-dist/main.cpp +++ b/core/linux-dist/main.cpp @@ -6,7 +6,7 @@ #if defined(__unix__) #include "log/LogManager.h" #include "emulator.h" -#include "rend/mainui.h" +#include "ui/mainui.h" #include "oslib/directory.h" #include "oslib/oslib.h" #include "stdclass.h" diff --git a/core/linux-dist/x11.cpp b/core/linux-dist/x11.cpp index a11d20a54..f7e3c329f 100644 --- a/core/linux-dist/x11.cpp +++ b/core/linux-dist/x11.cpp @@ -6,7 +6,7 @@ #include "types.h" #include "cfg/cfg.h" #include "x11.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "input/gamepad.h" #include "input/mouse.h" #include "icon.h" diff --git a/core/lua/lua.cpp b/core/lua/lua.cpp index ffd899799..96e928c3c 100644 --- a/core/lua/lua.cpp +++ b/core/lua/lua.cpp @@ -21,8 +21,8 @@ #ifdef USE_LUA #include #include -#include "rend/gui.h" -#include "rend/gui_util.h" +#include "ui/gui.h" +#include "ui/gui_util.h" #include "hw/mem/addrspace.h" #include "cfg/option.h" #include "emulator.h" diff --git a/core/network/ggpo.cpp b/core/network/ggpo.cpp index 785d3bfbb..00363a5e8 100644 --- a/core/network/ggpo.cpp +++ b/core/network/ggpo.cpp @@ -72,8 +72,8 @@ static void getLocalInput(MapleInputState inputState[4]) #ifdef USE_GGPO #include "ggponet.h" #include "emulator.h" -#include "rend/gui.h" -#include "rend/gui_util.h" +#include "ui/gui.h" +#include "ui/gui_util.h" #include "hw/mem/mem_watch.h" #include #include diff --git a/core/network/naomi_network.cpp b/core/network/naomi_network.cpp index 758cea437..16170cd53 100644 --- a/core/network/naomi_network.cpp +++ b/core/network/naomi_network.cpp @@ -19,7 +19,7 @@ #include "naomi_network.h" #include "hw/naomi/naomi_flashrom.h" #include "cfg/option.h" -#include "rend/gui.h" +#include "ui/gui.h" #include #include diff --git a/core/nullDC.cpp b/core/nullDC.cpp index 0d69d71a1..be8955bf2 100644 --- a/core/nullDC.cpp +++ b/core/nullDC.cpp @@ -5,12 +5,12 @@ #include "cfg/cfg.h" #include "cfg/option.h" #include "log/LogManager.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "oslib/oslib.h" #include "oslib/directory.h" #include "debug/gdb_server.h" #include "archive/rzip.h" -#include "rend/mainui.h" +#include "ui/mainui.h" #include "input/gamepad_device.h" #include "lua/lua.h" #include "stdclass.h" diff --git a/core/rend/dx11/dx11_driver.h b/core/rend/dx11/dx11_driver.h index a10c59f09..5807c2f01 100644 --- a/core/rend/dx11/dx11_driver.h +++ b/core/rend/dx11/dx11_driver.h @@ -17,10 +17,10 @@ along with Flycast. If not, see . */ #pragma once -#include "rend/imgui_driver.h" +#include "ui/imgui_driver.h" #include "imgui_impl_dx11.h" #include "dx11context.h" -#include "rend/gui.h" +#include "ui/gui.h" #include class DX11Driver final : public ImGuiDriver diff --git a/core/rend/dx11/dx11_renderer.cpp b/core/rend/dx11/dx11_renderer.cpp index 4a2d79765..b52e8fd3f 100644 --- a/core/rend/dx11/dx11_renderer.cpp +++ b/core/rend/dx11/dx11_renderer.cpp @@ -20,7 +20,7 @@ #include "dx11context.h" #include "hw/pvr/ta.h" #include "hw/pvr/pvr_mem.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "rend/tileclip.h" #include "rend/sorter.h" diff --git a/core/rend/dx9/d3d_renderer.cpp b/core/rend/dx9/d3d_renderer.cpp index 8c9b758be..42d892395 100644 --- a/core/rend/dx9/d3d_renderer.cpp +++ b/core/rend/dx9/d3d_renderer.cpp @@ -20,7 +20,7 @@ #include "hw/pvr/ta.h" #include "hw/pvr/pvr_mem.h" #include "rend/tileclip.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "rend/sorter.h" const u32 DstBlendGL[] diff --git a/core/rend/dx9/d3d_renderer.h b/core/rend/dx9/d3d_renderer.h index 36e360cd1..07787564c 100644 --- a/core/rend/dx9/d3d_renderer.h +++ b/core/rend/dx9/d3d_renderer.h @@ -25,7 +25,7 @@ #include "rend/transform_matrix.h" #include "d3d_texture.h" #include "d3d_shaders.h" -#include "rend/imgui_driver.h" +#include "ui/imgui_driver.h" class RenderStateCache { diff --git a/core/rend/dx9/dx9_driver.h b/core/rend/dx9/dx9_driver.h index a6ceb6d6b..e1fe7527d 100644 --- a/core/rend/dx9/dx9_driver.h +++ b/core/rend/dx9/dx9_driver.h @@ -17,7 +17,7 @@ along with Flycast. If not, see . */ #pragma once -#include "rend/imgui_driver.h" +#include "ui/imgui_driver.h" #include "imgui_impl_dx9.h" #include "dxcontext.h" #include diff --git a/core/rend/gles/gles.cpp b/core/rend/gles/gles.cpp index 213ed62dd..54117246c 100644 --- a/core/rend/gles/gles.cpp +++ b/core/rend/gles/gles.cpp @@ -2,7 +2,7 @@ #include "gles.h" #include "hw/pvr/ta.h" #ifndef LIBRETRO -#include "rend/gui.h" +#include "ui/gui.h" #else #include "rend/gles/postprocess.h" #include "vmu_xhair.h" diff --git a/core/rend/gles/gles.h b/core/rend/gles/gles.h index 9f3f0c076..3063bd341 100755 --- a/core/rend/gles/gles.h +++ b/core/rend/gles/gles.h @@ -7,7 +7,7 @@ #include "glcache.h" #include "rend/shader_util.h" #ifndef LIBRETRO -#include "rend/imgui_driver.h" +#include "ui/imgui_driver.h" #endif #include diff --git a/core/rend/gles/opengl_driver.cpp b/core/rend/gles/opengl_driver.cpp index 60663cfb9..3d63a2570 100644 --- a/core/rend/gles/opengl_driver.cpp +++ b/core/rend/gles/opengl_driver.cpp @@ -20,8 +20,8 @@ #include "imgui_impl_opengl3.h" #include "wsi/gl_context.h" #include "rend/osd.h" -#include "rend/gui.h" -#include "rend/gui_util.h" +#include "ui/gui.h" +#include "ui/gui_util.h" #include "glcache.h" #include "gles.h" diff --git a/core/rend/gles/opengl_driver.h b/core/rend/gles/opengl_driver.h index c100e6c95..59c41d146 100644 --- a/core/rend/gles/opengl_driver.h +++ b/core/rend/gles/opengl_driver.h @@ -17,7 +17,7 @@ along with Flycast. If not, see . */ #pragma once -#include "rend/imgui_driver.h" +#include "ui/imgui_driver.h" #include "emulator.h" #include diff --git a/core/rend/vulkan/vulkan_context.cpp b/core/rend/vulkan/vulkan_context.cpp index 846cc4c2a..e58252c71 100644 --- a/core/rend/vulkan/vulkan_context.cpp +++ b/core/rend/vulkan/vulkan_context.cpp @@ -22,7 +22,7 @@ #include "vulkan_renderer.h" #include "imgui.h" #include "imgui_impl_vulkan.h" -#include "../gui.h" +#include "ui/gui.h" #ifdef USE_SDL #include #include diff --git a/core/rend/vulkan/vulkan_driver.h b/core/rend/vulkan/vulkan_driver.h index 12c62ac34..0a8bc30cc 100644 --- a/core/rend/vulkan/vulkan_driver.h +++ b/core/rend/vulkan/vulkan_driver.h @@ -17,7 +17,7 @@ along with Flycast. If not, see . */ #pragma once -#include "rend/imgui_driver.h" +#include "ui/imgui_driver.h" #include "imgui_impl_vulkan.h" #include "vulkan_context.h" #include "texture.h" diff --git a/core/rend/vulkan/vulkan_renderer.h b/core/rend/vulkan/vulkan_renderer.h index 91a319082..f31b2328f 100644 --- a/core/rend/vulkan/vulkan_renderer.h +++ b/core/rend/vulkan/vulkan_renderer.h @@ -25,7 +25,7 @@ #include "rend/osd.h" #include "rend/transform_matrix.h" #ifndef LIBRETRO -#include "rend/gui.h" +#include "ui/gui.h" #endif #include diff --git a/core/rend/IconsFontAwesome6.h b/core/ui/IconsFontAwesome6.h similarity index 100% rename from core/rend/IconsFontAwesome6.h rename to core/ui/IconsFontAwesome6.h diff --git a/core/rend/boxart/boxart.cpp b/core/ui/boxart/boxart.cpp similarity index 100% rename from core/rend/boxart/boxart.cpp rename to core/ui/boxart/boxart.cpp diff --git a/core/rend/boxart/boxart.h b/core/ui/boxart/boxart.h similarity index 100% rename from core/rend/boxart/boxart.h rename to core/ui/boxart/boxart.h diff --git a/core/rend/boxart/gamesdb.cpp b/core/ui/boxart/gamesdb.cpp similarity index 100% rename from core/rend/boxart/gamesdb.cpp rename to core/ui/boxart/gamesdb.cpp diff --git a/core/rend/boxart/gamesdb.h b/core/ui/boxart/gamesdb.h similarity index 100% rename from core/rend/boxart/gamesdb.h rename to core/ui/boxart/gamesdb.h diff --git a/core/rend/boxart/pvrparser.h b/core/ui/boxart/pvrparser.h similarity index 100% rename from core/rend/boxart/pvrparser.h rename to core/ui/boxart/pvrparser.h diff --git a/core/rend/boxart/scraper.cpp b/core/ui/boxart/scraper.cpp similarity index 100% rename from core/rend/boxart/scraper.cpp rename to core/ui/boxart/scraper.cpp diff --git a/core/rend/boxart/scraper.h b/core/ui/boxart/scraper.h similarity index 100% rename from core/rend/boxart/scraper.h rename to core/ui/boxart/scraper.h diff --git a/core/rend/discord.cpp b/core/ui/discord.cpp similarity index 100% rename from core/rend/discord.cpp rename to core/ui/discord.cpp diff --git a/core/rend/game_scanner.h b/core/ui/game_scanner.h similarity index 100% rename from core/rend/game_scanner.h rename to core/ui/game_scanner.h diff --git a/core/rend/gui.cpp b/core/ui/gui.cpp similarity index 99% rename from core/rend/gui.cpp rename to core/ui/gui.cpp index 424c7ff2e..8efddf932 100644 --- a/core/rend/gui.cpp +++ b/core/ui/gui.cpp @@ -17,7 +17,7 @@ along with Flycast. If not, see . */ #include "gui.h" -#include "osd.h" +#include "rend/osd.h" #include "cfg/cfg.h" #include "hw/maple/maple_if.h" #include "hw/maple/maple_devs.h" @@ -35,7 +35,7 @@ #include "imgread/common.h" #include "log/LogManager.h" #include "emulator.h" -#include "rend/mainui.h" +#include "mainui.h" #include "lua/lua.h" #include "gui_chat.h" #include "imgui_driver.h" diff --git a/core/rend/gui.h b/core/ui/gui.h similarity index 100% rename from core/rend/gui.h rename to core/ui/gui.h diff --git a/core/rend/gui_achievements.cpp b/core/ui/gui_achievements.cpp similarity index 100% rename from core/rend/gui_achievements.cpp rename to core/ui/gui_achievements.cpp diff --git a/core/rend/gui_achievements.h b/core/ui/gui_achievements.h similarity index 100% rename from core/rend/gui_achievements.h rename to core/ui/gui_achievements.h diff --git a/core/rend/gui_android.cpp b/core/ui/gui_android.cpp similarity index 100% rename from core/rend/gui_android.cpp rename to core/ui/gui_android.cpp diff --git a/core/rend/gui_android.h b/core/ui/gui_android.h similarity index 100% rename from core/rend/gui_android.h rename to core/ui/gui_android.h diff --git a/core/rend/gui_chat.h b/core/ui/gui_chat.h similarity index 100% rename from core/rend/gui_chat.h rename to core/ui/gui_chat.h diff --git a/core/rend/gui_cheats.cpp b/core/ui/gui_cheats.cpp similarity index 100% rename from core/rend/gui_cheats.cpp rename to core/ui/gui_cheats.cpp diff --git a/core/rend/gui_util.cpp b/core/ui/gui_util.cpp similarity index 100% rename from core/rend/gui_util.cpp rename to core/ui/gui_util.cpp diff --git a/core/rend/gui_util.h b/core/ui/gui_util.h similarity index 100% rename from core/rend/gui_util.h rename to core/ui/gui_util.h diff --git a/core/rend/imgui_driver.cpp b/core/ui/imgui_driver.cpp similarity index 99% rename from core/rend/imgui_driver.cpp rename to core/ui/imgui_driver.cpp index 91d81fbf2..e6b36b3f4 100644 --- a/core/rend/imgui_driver.cpp +++ b/core/ui/imgui_driver.cpp @@ -18,7 +18,7 @@ */ #include "imgui_driver.h" #include "gui_util.h" -#include "osd.h" +#include "rend/osd.h" #define STBI_ONLY_JPEG #define STBI_ONLY_PNG #include diff --git a/core/rend/imgui_driver.h b/core/ui/imgui_driver.h similarity index 100% rename from core/rend/imgui_driver.h rename to core/ui/imgui_driver.h diff --git a/core/rend/mainui.cpp b/core/ui/mainui.cpp similarity index 100% rename from core/rend/mainui.cpp rename to core/ui/mainui.cpp diff --git a/core/rend/mainui.h b/core/ui/mainui.h similarity index 100% rename from core/rend/mainui.h rename to core/ui/mainui.h diff --git a/core/windows/winmain.cpp b/core/windows/winmain.cpp index 9146916f5..a49446d47 100644 --- a/core/windows/winmain.cpp +++ b/core/windows/winmain.cpp @@ -27,7 +27,7 @@ #include #include #include "cfg/option.h" -#include "rend/gui.h" +#include "ui/gui.h" #endif #include "oslib/oslib.h" #include "stdclass.h" @@ -35,7 +35,7 @@ #include "log/LogManager.h" #include "sdl/sdl.h" #include "emulator.h" -#include "rend/mainui.h" +#include "ui/mainui.h" #include "oslib/directory.h" #ifdef USE_BREAKPAD #include "breakpad/client/windows/handler/exception_handler.h" diff --git a/core/wsi/sdl.cpp b/core/wsi/sdl.cpp index e187a8e6a..dddc940a5 100644 --- a/core/wsi/sdl.cpp +++ b/core/wsi/sdl.cpp @@ -20,7 +20,7 @@ */ #if defined(USE_SDL) #include "gl_context.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "sdl/sdl.h" #include "cfg/option.h" diff --git a/shell/android-studio/flycast/src/main/jni/src/Android.cpp b/shell/android-studio/flycast/src/main/jni/src/Android.cpp index 351f6c564..553a83578 100644 --- a/shell/android-studio/flycast/src/main/jni/src/Android.cpp +++ b/shell/android-studio/flycast/src/main/jni/src/Android.cpp @@ -6,13 +6,13 @@ #include "hw/naomi/naomi_cart.h" #include "audio/audiostream.h" #include "imgread/common.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "rend/osd.h" #include "cfg/cfg.h" #include "log/LogManager.h" #include "wsi/context.h" #include "emulator.h" -#include "rend/mainui.h" +#include "ui/mainui.h" #include "cfg/option.h" #include "stdclass.h" #include "oslib/oslib.h" diff --git a/shell/apple/emulator-ios/emulator/AppDelegate.mm b/shell/apple/emulator-ios/emulator/AppDelegate.mm index dc5760173..592f5311e 100644 --- a/shell/apple/emulator-ios/emulator/AppDelegate.mm +++ b/shell/apple/emulator-ios/emulator/AppDelegate.mm @@ -28,7 +28,7 @@ #include "emulator.h" #include "log/LogManager.h" #include "cfg/option.h" -#include "rend/gui.h" +#include "ui/gui.h" static bool emulatorRunning; diff --git a/shell/apple/emulator-ios/emulator/EmulatorView.mm b/shell/apple/emulator-ios/emulator/EmulatorView.mm index e10491774..d77e2eba0 100644 --- a/shell/apple/emulator-ios/emulator/EmulatorView.mm +++ b/shell/apple/emulator-ios/emulator/EmulatorView.mm @@ -20,7 +20,7 @@ #import "EmulatorView.h" #include "types.h" -#include "rend/gui.h" +#include "ui/gui.h" #include "ios_gamepad.h" @implementation EmulatorView { diff --git a/shell/apple/emulator-ios/emulator/FlycastViewController.mm b/shell/apple/emulator-ios/emulator/FlycastViewController.mm index 018c261a9..fb437bead 100644 --- a/shell/apple/emulator-ios/emulator/FlycastViewController.mm +++ b/shell/apple/emulator-ios/emulator/FlycastViewController.mm @@ -33,7 +33,7 @@ #include "types.h" #include "wsi/context.h" -#include "rend/mainui.h" +#include "ui/mainui.h" #include "emulator.h" #include "log/LogManager.h" #include "stdclass.h" diff --git a/shell/apple/emulator-ios/emulator/ios_gamepad.h b/shell/apple/emulator-ios/emulator/ios_gamepad.h index 08159cc84..3d768c713 100644 --- a/shell/apple/emulator-ios/emulator/ios_gamepad.h +++ b/shell/apple/emulator-ios/emulator/ios_gamepad.h @@ -23,7 +23,7 @@ #include #include "input/gamepad_device.h" #include "input/mouse.h" -#include "rend/gui.h" +#include "ui/gui.h" enum IOSButton { IOS_BTN_A = 1, diff --git a/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm b/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm index 1ebbe7e9d..0b2dd71d0 100644 --- a/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm +++ b/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm @@ -9,7 +9,7 @@ #include "emulator.h" #include /* for MAXPATHLEN */ #include -#include "rend/gui.h" +#include "ui/gui.h" #include "oslib/oslib.h" #ifdef USE_BREAKPAD diff --git a/shell/apple/emulator-osx/emulator-osx/osx-main.mm b/shell/apple/emulator-osx/emulator-osx/osx-main.mm index bf5eb401f..089ce81f4 100644 --- a/shell/apple/emulator-osx/emulator-osx/osx-main.mm +++ b/shell/apple/emulator-osx/emulator-osx/osx-main.mm @@ -21,7 +21,7 @@ #include "stdclass.h" #include "oslib/oslib.h" #include "emulator.h" -#include "rend/mainui.h" +#include "ui/mainui.h" #include int darw_printf(const char* text, ...) diff --git a/shell/switch/switch_main.cpp b/shell/switch/switch_main.cpp index 1c3fdcffe..ffc102655 100644 --- a/shell/switch/switch_main.cpp +++ b/shell/switch/switch_main.cpp @@ -19,7 +19,7 @@ #include "stdclass.h" #include "log/LogManager.h" #include "emulator.h" -#include "rend/mainui.h" +#include "ui/mainui.h" #include "oslib/directory.h" int main(int argc, char *argv[])