From 66c15314e2429e43766cc44738ea242771d5b51d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 19 Nov 2015 08:56:08 +0100 Subject: [PATCH] Get rid of some header files --- gfx/common/win32_common.cpp | 1 - gfx/common/win32_common.h | 4 ++++ gfx/drivers/gl.c | 2 +- gfx/drivers_wm/win32_shader_dlg.h | 22 ---------------------- ui/drivers/ui_win32.c | 1 - 5 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 gfx/drivers_wm/win32_shader_dlg.h diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp index ba2817ee5e..a25bf7fefa 100644 --- a/gfx/common/win32_common.cpp +++ b/gfx/common/win32_common.cpp @@ -28,7 +28,6 @@ #include #include "../../retroarch.h" #include "../video_thread_wrapper.h" -#include "../drivers_wm/win32_shader_dlg.h" #ifndef _MSC_VER extern "C" { diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h index 4bd0e91e61..9804b4f8a7 100644 --- a/gfx/common/win32_common.h +++ b/gfx/common/win32_common.h @@ -48,6 +48,10 @@ void win32_monitor_get_info(void); void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id); void create_gl_context(HWND hwnd, bool *quit); + +bool win32_shader_dlg_init(void); +void shader_dlg_show(HWND parent_hwnd); +void shader_dlg_params_reload(void); #endif void win32_monitor_from_window(HWND data, bool destroy); diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 74756c147c..a7a5bcd488 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -56,7 +56,7 @@ #endif #if defined(_WIN32) && !defined(_XBOX) -#include "../drivers_wm/win32_shader_dlg.h" +#include "../common/win32_common.h" #endif #include "../video_shader_driver.h" diff --git a/gfx/drivers_wm/win32_shader_dlg.h b/gfx/drivers_wm/win32_shader_dlg.h deleted file mode 100644 index f5e038bdde..0000000000 --- a/gfx/drivers_wm/win32_shader_dlg.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef WGL_SHADER_DLG_H -#define WGL_SHADER_DLG_H - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _XBOX -#define WIN32_LEAN_AND_MEAN -#include - -bool win32_shader_dlg_init(void); -void shader_dlg_show(HWND parent_hwnd); -void shader_dlg_params_reload(void); - -#endif - -#ifdef __cplusplus -} -#endif - -#endif // WGL_SHADER_DLG_H diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index a073dad336..81ff235c85 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -46,7 +46,6 @@ #include "../../runloop.h" #include "../../gfx/video_context_driver.h" #include "../../gfx/video_monitor.h" -#include "../../gfx/drivers_wm/win32_shader_dlg.h" #include "../../gfx/common/gl_common.h" #include "../../gfx/common/win32_common.h"