From 5e6cf7d74d7bb9d5fef62433bd1651c34b8379b4 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 4 Apr 2015 13:56:26 -0500 Subject: [PATCH] windows build fixes --- gfx/d3d/d3d.cpp | 4 ++-- gfx/d3d/d3d_wrapper.h | 2 +- gfx/drivers/gl.c | 4 ++-- gfx/drivers/sdl2_gfx.c | 2 +- input/drivers_keyboard/keyboard_event_win32.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index 6a1f8a9a44..8008982c4e 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -29,8 +29,8 @@ #include "../../runloop.h" #ifndef _XBOX -#include "../drivers_context/win32_common.h" -#include "../drivers_context/win32_dwm_common.h" +#include "../drivers_wm/win32_common.h" +#include "../drivers_wm/win32_dwm_common.h" #define HAVE_MONITOR #define HAVE_WINDOW diff --git a/gfx/d3d/d3d_wrapper.h b/gfx/d3d/d3d_wrapper.h index 8479d61391..6274cc7fee 100644 --- a/gfx/d3d/d3d_wrapper.h +++ b/gfx/d3d/d3d_wrapper.h @@ -17,7 +17,7 @@ #ifndef _D3D_WRAPPER_H #define _D3D_WRAPPER_H -#include "../drivers_context/win32_common.h" +#include "../drivers_wm/win32_common.h" #include "d3d_defines.h" void d3d_swap(void *data, LPDIRECT3DDEVICE dev); diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index db48972e9e..2916e3fca7 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -54,8 +54,8 @@ #endif #if defined(_WIN32) && !defined(_XBOX) -#include "../drivers_context/win32_dwm_common.h" -#include "../drivers_context/win32_shader_dlg.h" +#include "../drivers_wm/win32_dwm_common.h" +#include "../drivers_wm/win32_shader_dlg.h" #endif #include "../video_shader_driver.h" diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c index aa8c8640fa..2f1db80e1f 100644 --- a/gfx/drivers/sdl2_gfx.c +++ b/gfx/drivers/sdl2_gfx.c @@ -35,7 +35,7 @@ #endif #if defined(_WIN32) && !defined(_XBOX) -#include "../drivers_context/win32_dwm_common.h" +#include "../drivers_wm/win32_dwm_common.h" #endif #ifdef HAVE_CONFIG_H diff --git a/input/drivers_keyboard/keyboard_event_win32.c b/input/drivers_keyboard/keyboard_event_win32.c index df9435e7d6..2b1e2674ec 100644 --- a/input/drivers_keyboard/keyboard_event_win32.c +++ b/input/drivers_keyboard/keyboard_event_win32.c @@ -16,7 +16,7 @@ #include "../../general.h" #include "../keyboard_line.h" -#include "../../gfx/drivers_context/win32_common.h" +#include "../../gfx/drivers_wm/win32_common.h" #include "../input_common.h" #include "../input_keymaps.h"