mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move win32_common.c to gfx/common

Browse Source
This commit is contained in:
twinaphex 2015-04-09 05:16:02 +02:00
parent 61ca56ae8e
commit 1f23338ca4
10 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -711,7 +711,7 @@ endif
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
OBJ += media/rarch.o \ OBJ += media/rarch.o \
input/drivers_keyboard/keyboard_event_win32.o \ input/drivers_keyboard/keyboard_event_win32.o \
gfx/drivers_wm/win32_common.o \ gfx/common/win32_common.o \
gfx/drivers_wm/win32_dwm_common.o \ gfx/drivers_wm/win32_dwm_common.o \
frontend/drivers/platform_win32.o frontend/drivers/platform_win32.o
endif endif

21
gfx/drivers_wm/win32_common.c → gfx/common/win32_common.c
View File

@ -13,26 +13,31 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../../driver.h"
#include "../../general.h"
#include "win32_common.h"
#include <string.h>
#if !defined(_XBOX) && defined(_WIN32)
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
#endif #endif
#include "../../driver.h"
#include "../../general.h"
#include "win32_common.h"
#include <windows.h> #include <windows.h>
#include <commdlg.h> #include <commdlg.h>
#include <string.h>
#if !defined(_XBOX) && defined(_WIN32)
#include "../../retroarch.h" #include "../../retroarch.h"
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "win32_shader_dlg.h" #include "win32_shader_dlg.h"
#endif #endif
static bool win32_browser(HWND owner, char *filename, const char *extensions, static bool win32_browser(
const char *title, const char *initial_dir) HWND owner,
char *filename,
const char *extensions,
const char *title,
const char *initial_dir)
{ {
OPENFILENAME ofn; OPENFILENAME ofn;

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

2
gfx/d3d/d3d.cpp
View File

@ -26,8 +26,8 @@
#include "../../runloop.h" #include "../../runloop.h"
#include "render_chain_driver.h" #include "render_chain_driver.h"
#include "../common/win32_common.h"
#ifndef _XBOX #ifndef _XBOX
#include "../drivers_wm/win32_common.h"
#include "../drivers_wm/win32_dwm_common.h" #include "../drivers_wm/win32_dwm_common.h"
#define HAVE_MONITOR #define HAVE_MONITOR

2
gfx/d3d/d3d_wrapper.h
View File

@ -17,7 +17,7 @@
#ifndef _D3D_WRAPPER_H #ifndef _D3D_WRAPPER_H
#define _D3D_WRAPPER_H #define _D3D_WRAPPER_H
#include "../drivers_wm/win32_common.h" #include "../common/win32_common.h"
#include "d3d_defines.h" #include "d3d_defines.h"
void d3d_swap(void *data, LPDIRECT3DDEVICE dev); void d3d_swap(void *data, LPDIRECT3DDEVICE dev);

2
gfx/drivers_context/d3d_ctx.cpp
View File

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

2
gfx/drivers_context/wgl_ctx.c
View File

@ -26,7 +26,7 @@
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../drivers/gl_common.h" #include "../drivers/gl_common.h"
#include "../video_monitor.h" #include "../video_monitor.h"
#include "../drivers_wm/win32_common.h" #include "../common/win32_common.h"
#include "../drivers_wm/win32_shader_dlg.h" #include "../drivers_wm/win32_shader_dlg.h"
#include <windows.h> #include <windows.h>
#include <commdlg.h> #include <commdlg.h>

2
gfx/drivers_wm/win32_shader_dlg.c
View File

@ -30,7 +30,7 @@
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../drivers/gl_common.h" #include "../drivers/gl_common.h"
#include "../video_monitor.h" #include "../video_monitor.h"
#include "win32_common.h" #include "../common/win32_common.h"
#include "win32_shader_dlg.h" #include "win32_shader_dlg.h"
#include <windows.h> #include <windows.h>
#include <commdlg.h> #include <commdlg.h>

2
griffin/griffin.c
View File

@ -87,7 +87,7 @@ CHEATS
UI COMMON CONTEXT UI COMMON CONTEXT
============================================================ */ ============================================================ */
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#include "../gfx/drivers_wm/win32_common.c" #include "../gfx/common/win32_common.c"
#include "../gfx/drivers_wm/win32_dwm_common.c" #include "../gfx/drivers_wm/win32_dwm_common.c"
#endif #endif

2
input/drivers_keyboard/keyboard_event_win32.c
View File

@ -16,7 +16,7 @@
#include "../../general.h" #include "../../general.h"
#include "../keyboard_line.h" #include "../keyboard_line.h"
#include "../../gfx/drivers_wm/win32_common.h" #include "../../gfx/common/win32_common.h"
#include "../input_common.h" #include "../input_common.h"
#include "../input_keymaps.h" #include "../input_keymaps.h"