mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move window manager code to gfx/drivers_wm

Browse Source
This commit is contained in:
twinaphex 2015-04-04 20:30:44 +02:00
parent 9e419d932f
commit 36b054506d
17 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.common
View File

@ -376,7 +376,9 @@ ifeq ($(HAVE_WINXINPUT), 1)
endif endif
ifeq ($(HAVE_X11), 1) ifeq ($(HAVE_X11), 1)
OBJ += input/drivers/x11_input.o gfx/drivers_context/x11_common.o input/keyboard_event_x11.o OBJ += input/drivers/x11_input.o \
gfx/drivers_wm/x11_common.o \
input/keyboard_event_x11.o
LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS) LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS) DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
endif endif
@ -486,7 +488,7 @@ ifeq ($(HAVE_OPENGL), 1)
else ifneq ($(findstring Win32,$(OS)),) else ifneq ($(findstring Win32,$(OS)),)
LIBS += -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32 LIBS += -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
OBJ += gfx/drivers_context/wgl_ctx.o OBJ += gfx/drivers_context/wgl_ctx.o
OBJ += gfx/drivers_context/wgl_shader_dlg.o OBJ += gfx/drivers_wm/win32_shader_dlg.o
else else
LIBS += -lGL LIBS += -lGL
endif endif
@ -689,8 +691,8 @@ endif
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
OBJ += media/rarch.o \ OBJ += media/rarch.o \
input/keyboard_event_win32.o \ input/keyboard_event_win32.o \
gfx/drivers_context/win32_common.o \ gfx/drivers_wm/win32_common.o \
gfx/drivers_context/win32_dwm_common.o gfx/drivers_wm/win32_dwm_common.o
endif endif
# Record # Record

2
gfx/drivers/sdl2_gfx.c
View File

@ -31,7 +31,7 @@
#include "../font_renderer_driver.h" #include "../font_renderer_driver.h"
#ifdef HAVE_X11 #ifdef HAVE_X11
#include "../drivers_context/x11_common.h" #include "../drivers_wm/x11_common.h"
#endif #endif
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)

2
gfx/drivers/sdl_gfx.c
View File

@ -27,7 +27,7 @@
#include "../font_renderer_driver.h" #include "../font_renderer_driver.h"
#ifdef HAVE_X11 #ifdef HAVE_X11
#include "../drivers_context/x11_common.h" #include "../drivers_wm/x11_common.h"
#endif #endif
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)

2
gfx/drivers/xvideo.c
View File

@ -24,7 +24,7 @@
#include "../font_renderer_driver.h" #include "../font_renderer_driver.h"
#include <retro_inline.h> #include <retro_inline.h>
#include "../drivers_context/x11_common.h" #include "../drivers_wm/x11_common.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>

2
gfx/drivers_context/d3d_ctx.cpp
View File

@ -16,7 +16,7 @@
*/ */
#include "../d3d/d3d.h" #include "../d3d/d3d.h"
#include "win32_common.h" #include "../drivers_wm/win32_common.h"
#include "../../runloop.h" #include "../../runloop.h"
#include "../video_monitor.h" #include "../video_monitor.h"

2
gfx/drivers_context/glx_ctx.c
View File

@ -18,7 +18,7 @@
#include "../../runloop.h" #include "../../runloop.h"
#include "../gl_common.h" #include "../gl_common.h"
#include "../video_monitor.h" #include "../video_monitor.h"
#include "x11_common.h" #include "../drivers_wm/x11_common.h"
#include <signal.h> #include <signal.h>
#include <stdint.h> #include <stdint.h>

4
gfx/drivers_context/wgl_ctx.c
View File

@ -26,8 +26,8 @@
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../gl_common.h" #include "../gl_common.h"
#include "../video_monitor.h" #include "../video_monitor.h"
#include "win32_common.h" #include "../drivers_wm/win32_common.h"
#include "wgl_shader_dlg.h" #include "../drivers_wm/win32_shader_dlg.h"
#include <windows.h> #include <windows.h>
#include <commdlg.h> #include <commdlg.h>
#include <string.h> #include <string.h>

2
gfx/drivers_context/xegl_ctx.c
View File

@ -22,7 +22,7 @@
#include "../../runloop.h" #include "../../runloop.h"
#include "../gl_common.h" #include "../gl_common.h"
#include "../video_monitor.h" #include "../video_monitor.h"
#include "x11_common.h" #include "../drivers_wm/x11_common.h"
#include <signal.h> #include <signal.h>
#include <stdint.h> #include <stdint.h>

0
gfx/drivers_context/win32_common.c → gfx/drivers_wm/win32_common.c
View File

0
gfx/drivers_context/win32_common.h → gfx/drivers_wm/win32_common.h
View File

0
gfx/drivers_context/win32_dwm_common.c → gfx/drivers_wm/win32_dwm_common.c
View File

0
gfx/drivers_context/win32_dwm_common.h → gfx/drivers_wm/win32_dwm_common.h
View File

2
gfx/drivers_context/wgl_shader_dlg.c → gfx/drivers_wm/win32_shader_dlg.c
View File

@ -31,7 +31,7 @@
#include "../gl_common.h" #include "../gl_common.h"
#include "../video_monitor.h" #include "../video_monitor.h"
#include "win32_common.h" #include "win32_common.h"
#include "wgl_shader_dlg.h" #include "win32_shader_dlg.h"
#include <windows.h> #include <windows.h>
#include <commdlg.h> #include <commdlg.h>
#include <commctrl.h> #include <commctrl.h>

0
gfx/drivers_context/wgl_shader_dlg.h → gfx/drivers_wm/win32_shader_dlg.h
View File

0
gfx/drivers_context/x11_common.c → gfx/drivers_wm/x11_common.c
View File

0
gfx/drivers_context/x11_common.h → gfx/drivers_wm/x11_common.h
View File

8
griffin/griffin.c
View File

@ -87,8 +87,8 @@ CHEATS
UI COMMON CONTEXT UI COMMON CONTEXT
============================================================ */ ============================================================ */
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#include "../gfx/drivers_context/win32_common.c" #include "../gfx/drivers_wm/win32_common.c"
#include "../gfx/drivers_context/win32_dwm_common.c" #include "../gfx/drivers_wm/win32_dwm_common.c"
#endif #endif
/*============================================================ /*============================================================
@ -129,13 +129,13 @@ VIDEO CONTEXT
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#include "../gfx/drivers_context/wgl_ctx.c" #include "../gfx/drivers_context/wgl_ctx.c"
#include "../gfx/drivers_context/wgl_shader_dlg.c" #include "../gfx/drivers_wm/win32_shader_dlg.c"
#endif #endif
#endif #endif
#ifdef HAVE_X11 #ifdef HAVE_X11
#include "../gfx/drivers_context/x11_common.c" #include "../gfx/drivers_wm/x11_common.c"
#endif #endif