Rename gfx_common.c to win32_dwm_common.c

Makefile.common

@@ -116,7 +116,6 @@ OBJ += frontend/frontend.o \
 		dynamic_dummy.o \
 		libretro-sdk/queues/message_queue.o \
 		rewind.o \
-		gfx/gfx_common.o \
 		gfx/drivers_font_renderer/bitmapfont.o \
 		input/input_autodetect.o \
 		input/input_joypad_driver.o \
@@ -629,7 +628,8 @@ endif
 ifneq ($(findstring Win32,$(OS)),)
    OBJ += media/rarch.o \
           input/keyboard_event_win32.o \
-			 gfx/drivers_context/win32_common.o
+			 gfx/drivers_context/win32_common.o \
+			 gfx/drivers_context/win32_dwm_common.o
 endif
 
 # Record

driver.c

@@ -25,7 +25,7 @@
 #include "gfx/video_viewport.h"
 #include "gfx/video_pixel_converter.h"
 #include "audio/audio_monitor.h"
-#include "gfx/gfx_common.h"
+#include "gfx/drivers_context/win32_dwm_common.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"

gfx/d3d/d3d.cpp

@@ -26,9 +26,10 @@
 #endif
 #include "../video_viewport.h"
 
-#include "../drivers_context/win32_common.h"
-
 #ifndef _XBOX
+#include "../drivers_context/win32_common.h"
+#include "../drivers_context/win32_dwm_common.h"
+
 #define HAVE_MONITOR
 #define HAVE_WINDOW
 #endif

gfx/drivers/gl.c

@@ -49,6 +49,10 @@
 #include <string/string_list.h>
 #endif
 
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../drivers_context/win32_dwm_common.h"
+#endif
+
 #include "../video_shader_driver.h"
 
 /* Used for the last pass when rendering to the back buffer. */

gfx/drivers/sdl2_gfx.c

@@ -32,6 +32,10 @@
 #include "../drivers_context/x11_common.h"
 #endif
 
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../drivers_context/win32_dwm_common.h"
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

gfx/drivers/sdl_gfx.c

@@ -29,6 +29,10 @@
 #include "../drivers_context/x11_common.h"
 #endif
 
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../drivers_context/win32_dwm_common.h"
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

gfx/drivers_context/win32_dwm_common.c

@@ -14,12 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gfx_common.h"
+#include "win32_dwm_common.h"
-#include "../general.h"
+#include "../../general.h"
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include <windows.h>
-#include "../dynamic.h"
+#include "../../dynamic.h"
 
 /* We only load this library once, so we let it be 
  * unloaded at application shutdown, since unloading 

gfx/drivers_context/win32_dwm_common.h

@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GFX_COMMON_H
+#ifndef __WIN32_DWM_COMMON_H
-#define __GFX_COMMON_H
+#define __WIN32_DWM_COMMON_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,13 +23,8 @@ extern "C" {
 
 #include <stddef.h>
 #include <stdint.h>
-#include "../general.h"
 #include <boolean.h>
 
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
 #ifdef _WIN32
 void gfx_set_dwm(void);
 #endif

griffin/griffin.c

@@ -87,6 +87,7 @@ UI COMMON CONTEXT
 ============================================================ */
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../gfx/drivers_context/win32_common.c"
+#include "../gfx/drivers_context/win32_dwm_common.c"
 #endif
 
 /*============================================================
@@ -198,8 +199,6 @@ VIDEO DRIVER
 #include "../gfx/drivers/omap_gfx.c"
 #endif
 
-#include "../gfx/gfx_common.c"
-
 #ifdef _XBOX
 #include "../xdk/xdk_resources.cpp"
 #endif