ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: gather backends under imgui/backends directory 

stay consistent with upstream
This commit is contained in:
scribam 2023-05-03 09:50:37 +02:00 committed by flyinghead
parent 29cdc77817
commit 220fd51b27
18 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -1147,8 +1147,8 @@ if(USE_OPENGL)
if(NOT LIBRETRO) if(NOT LIBRETRO)
target_sources(${PROJECT_NAME} PRIVATE target_sources(${PROJECT_NAME} PRIVATE
core/rend/gles/imgui_impl_opengl3.cpp core/deps/imgui/backends/imgui_impl_opengl3.cpp
core/rend/gles/imgui_impl_opengl3.h core/deps/imgui/backends/imgui_impl_opengl3.h
core/rend/gles/opengl_driver.cpp core/rend/gles/opengl_driver.cpp
core/rend/gles/opengl_driver.h) core/rend/gles/opengl_driver.h)
endif() endif()
@ -1282,8 +1282,8 @@ if(USE_VULKAN)
target_sources(${PROJECT_NAME} PRIVATE target_sources(${PROJECT_NAME} PRIVATE
core/rend/vulkan/vulkan_driver.h core/rend/vulkan/vulkan_driver.h
core/rend/vulkan/vulkan_context.cpp core/rend/vulkan/vulkan_context.cpp
core/rend/vulkan/imgui_impl_vulkan.cpp core/deps/imgui/backends/imgui_impl_vulkan.cpp
core/rend/vulkan/imgui_impl_vulkan.h) core/deps/imgui/backends/imgui_impl_vulkan.h)
if(CMAKE_SIZEOF_VOID_P EQUAL 4) if(CMAKE_SIZEOF_VOID_P EQUAL 4)
target_compile_definitions(${PROJECT_NAME} PRIVATE ImTextureID=ImU64) target_compile_definitions(${PROJECT_NAME} PRIVATE ImTextureID=ImU64)
endif() endif()
@ -1303,8 +1303,8 @@ if(WIN32 AND USE_DX9 AND NOT LIBRETRO AND NOT WINDOWS_STORE AND ("x86" IN_LIST A
core/rend/dx9/dx9_driver.h core/rend/dx9/dx9_driver.h
core/rend/dx9/dxcontext.cpp core/rend/dx9/dxcontext.cpp
core/rend/dx9/dxcontext.h core/rend/dx9/dxcontext.h
core/rend/dx9/imgui_impl_dx9.h core/deps/imgui/backends/imgui_impl_dx9.h
core/rend/dx9/imgui_impl_dx9.cpp) core/deps/imgui/backends/imgui_impl_dx9.cpp)
target_sources(${PROJECT_NAME} PRIVATE ${REND_DX9_FILES}) target_sources(${PROJECT_NAME} PRIVATE ${REND_DX9_FILES})
if(NOT MINGW) if(NOT MINGW)
@ -1323,8 +1323,8 @@ endif()
if(WIN32 AND USE_DX11) if(WIN32 AND USE_DX11)
if(NOT LIBRETRO) if(NOT LIBRETRO)
target_sources(${PROJECT_NAME} PRIVATE target_sources(${PROJECT_NAME} PRIVATE
core/rend/dx11/imgui_impl_dx11.cpp core/deps/imgui/backends/imgui_impl_dx11.cpp
core/rend/dx11/imgui_impl_dx11.h) core/deps/imgui/backends/imgui_impl_dx11.h)
endif() endif()
target_sources(${PROJECT_NAME} PRIVATE target_sources(${PROJECT_NAME} PRIVATE
core/rend/dx11/dx11_driver.h core/rend/dx11/dx11_driver.h

0
core/rend/dx11/imgui_impl_dx11.cpp → core/deps/imgui/backends/imgui_impl_dx11.cpp
View File

0
core/rend/dx11/imgui_impl_dx11.h → core/deps/imgui/backends/imgui_impl_dx11.h
View File

0
core/rend/dx9/imgui_impl_dx9.cpp → core/deps/imgui/backends/imgui_impl_dx9.cpp
View File

0
core/rend/dx9/imgui_impl_dx9.h → core/deps/imgui/backends/imgui_impl_dx9.h
View File

2
core/rend/gles/imgui_impl_opengl3.cpp → core/deps/imgui/backends/imgui_impl_opengl3.cpp
View File

@ -67,7 +67,7 @@
#endif #endif
#include "wsi/gl_context.h" #include "wsi/gl_context.h"
#include "glcache.h" #include "rend/gles/glcache.h"
#include "hw/pvr/Renderer_if.h" #include "hw/pvr/Renderer_if.h"
// OpenGL Data // OpenGL Data

0
core/rend/gles/imgui_impl_opengl3.h → core/deps/imgui/backends/imgui_impl_opengl3.h
View File

0
core/rend/vulkan/imgui_impl_vulkan.cpp → core/deps/imgui/backends/imgui_impl_vulkan.cpp
View File

0
core/rend/vulkan/imgui_impl_vulkan.h → core/deps/imgui/backends/imgui_impl_vulkan.h
View File

2
core/rend/dx11/dx11_driver.h
View File

@ -18,7 +18,7 @@
*/ */
#pragma once #pragma once
#include "rend/imgui_driver.h" #include "rend/imgui_driver.h"
#include "imgui_impl_dx11.h" #include "imgui/backends/imgui_impl_dx11.h"
#include "dx11context.h" #include "dx11context.h"
#include "rend/gui.h" #include "rend/gui.h"
#include <unordered_map> #include <unordered_map>

2
core/rend/dx11/dx11context.cpp
View File

@ -25,7 +25,7 @@
#include "hw/pvr/Renderer_if.h" #include "hw/pvr/Renderer_if.h"
#include "emulator.h" #include "emulator.h"
#include "dx11_driver.h" #include "dx11_driver.h"
#include "imgui_impl_dx11.h" #include "imgui/backends/imgui_impl_dx11.h"
#ifdef TARGET_UWP #ifdef TARGET_UWP
#include <windows.h> #include <windows.h>
#include <gamingdeviceinformation.h> #include <gamingdeviceinformation.h>

2
core/rend/dx9/dx9_driver.h
View File

@ -18,7 +18,7 @@
*/ */
#pragma once #pragma once
#include "rend/imgui_driver.h" #include "rend/imgui_driver.h"
#include "imgui_impl_dx9.h" #include "imgui/backends/imgui_impl_dx9.h"
#include "dxcontext.h" #include "dxcontext.h"
#include <unordered_map> #include <unordered_map>

2
core/rend/dx9/dxcontext.cpp
View File

@ -25,7 +25,7 @@
#include "hw/pvr/Renderer_if.h" #include "hw/pvr/Renderer_if.h"
#include "emulator.h" #include "emulator.h"
#include "dx9_driver.h" #include "dx9_driver.h"
#include "imgui_impl_dx9.h" #include "imgui/backends/imgui_impl_dx9.h"
DXContext theDXContext; DXContext theDXContext;

2
core/rend/gles/opengl_driver.cpp
View File

@ -17,7 +17,7 @@
along with Flycast. If not, see <https://www.gnu.org/licenses/>. along with Flycast. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "opengl_driver.h" #include "opengl_driver.h"
#include "imgui_impl_opengl3.h" #include "imgui/backends/imgui_impl_opengl3.h"
#include "wsi/gl_context.h" #include "wsi/gl_context.h"
#include "rend/osd.h" #include "rend/osd.h"
#include "rend/gui.h" #include "rend/gui.h"

2
core/rend/gui.cpp
View File

@ -22,7 +22,7 @@
#include "hw/maple/maple_if.h" #include "hw/maple/maple_if.h"
#include "hw/maple/maple_devs.h" #include "hw/maple/maple_devs.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "imgui/roboto_medium.h" #include "roboto_medium.h"
#include "network/net_handshake.h" #include "network/net_handshake.h"
#include "network/ggpo.h" #include "network/ggpo.h"
#include "wsi/context.h" #include "wsi/context.h"

0
core/deps/imgui/roboto_medium.h → core/rend/roboto_medium.h
View File

2
core/rend/vulkan/vulkan_context.cpp
View File

@ -20,7 +20,7 @@
*/ */
#include "vulkan_context.h" #include "vulkan_context.h"
#include "imgui/imgui.h" #include "imgui/imgui.h"
#include "imgui_impl_vulkan.h" #include "imgui/backends/imgui_impl_vulkan.h"
#include "../gui.h" #include "../gui.h"
#ifdef USE_SDL #ifdef USE_SDL
#include <sdl/sdl.h> #include <sdl/sdl.h>

2
core/rend/vulkan/vulkan_driver.h
View File

@ -18,7 +18,7 @@
*/ */
#pragma once #pragma once
#include "rend/imgui_driver.h" #include "rend/imgui_driver.h"
#include "imgui_impl_vulkan.h" #include "imgui/backends/imgui_impl_vulkan.h"
#include "vulkan_context.h" #include "vulkan_context.h"
#include "texture.h" #include "texture.h"
#include <unordered_map> #include <unordered_map>