From 09b25e54c5742c7e1ba32f3eac33863681cad9b9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 23:19:21 +0100 Subject: [PATCH] Rename gl_font.c and d3d_font.c --- Makefile.common | 4 ++-- gfx/d3d/d3d.h | 2 +- gfx/drivers_context/bbqnx_ctx.c | 1 - gfx/{fonts/d3d_font.c => font_d3d_driver.c} | 4 ++-- gfx/{fonts/d3d_font.h => font_d3d_driver.h} | 6 +++--- gfx/{fonts/gl_font.c => font_gl_driver.c} | 4 ++-- gfx/{fonts/gl_font.h => font_gl_driver.h} | 7 +++---- gfx/fonts/d3d_w32_font.cpp | 2 +- gfx/fonts/fonts.c | 1 - gfx/fonts/xdk1_xfonts.c | 2 +- gfx/fonts/xdk360_fonts.cpp | 2 +- gfx/gl_common.h | 2 +- gfx/video_thread_wrapper.h | 2 +- griffin/griffin.c | 4 ++-- 14 files changed, 20 insertions(+), 23 deletions(-) rename gfx/{fonts/d3d_font.c => font_d3d_driver.c} (96%) rename gfx/{fonts/d3d_font.h => font_d3d_driver.h} (94%) rename gfx/{fonts/gl_font.c => font_gl_driver.c} (96%) rename gfx/{fonts/gl_font.h => font_gl_driver.h} (94%) diff --git a/Makefile.common b/Makefile.common index 4bea588dbb..5524ff5591 100644 --- a/Makefile.common +++ b/Makefile.common @@ -376,7 +376,7 @@ ifeq ($(HAVE_OPENGL), 1) gfx/gl_common.o \ gfx/video_context_driver.o \ gfx/drivers_context/gfx_null_ctx.o \ - gfx/fonts/gl_font.o \ + gfx/font_gl_driver.o \ gfx/fonts/gl_raster_font.o \ libretro-sdk/gfx/math/matrix_4x4.o \ gfx/video_state_tracker.o \ @@ -512,7 +512,7 @@ ifeq ($(HAVE_D3D9), 1) OBJ += gfx/d3d/d3d.o \ gfx/d3d/render_chain.o \ gfx/d3d/d3d_wrapper.o \ - gfx/fonts/d3d_font.o \ + gfx/font_d3d_driver.o \ gfx/fonts/d3d_w32_font.o \ gfx/drivers_context/d3d_ctx.o DEFINES += -DHAVE_WIN32_D3D9 diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h index db86dd87a6..809a55a883 100644 --- a/gfx/d3d/d3d.h +++ b/gfx/d3d/d3d.h @@ -49,7 +49,7 @@ #include "../video_shader_driver.h" #endif -#include "../fonts/d3d_font.h" +#include "../font_d3d_driver.h" #include "../video_context_driver.h" #include "../gfx_common.h" diff --git a/gfx/drivers_context/bbqnx_ctx.c b/gfx/drivers_context/bbqnx_ctx.c index 373649128f..596da9a903 100644 --- a/gfx/drivers_context/bbqnx_ctx.c +++ b/gfx/drivers_context/bbqnx_ctx.c @@ -29,7 +29,6 @@ #include "../image/image.h" -#include "../fonts/gl_font.h" #include #ifdef HAVE_GLSL diff --git a/gfx/fonts/d3d_font.c b/gfx/font_d3d_driver.c similarity index 96% rename from gfx/fonts/d3d_font.c rename to gfx/font_d3d_driver.c index 1601191679..c971031c96 100644 --- a/gfx/fonts/d3d_font.c +++ b/gfx/font_d3d_driver.c @@ -14,8 +14,8 @@ * If not, see . */ -#include "d3d_font.h" -#include "../../general.h" +#include "font_d3d_driver.h" +#include "../general.h" static const d3d_font_renderer_t *d3d_font_backends[] = { #if defined(_XBOX1) diff --git a/gfx/fonts/d3d_font.h b/gfx/font_d3d_driver.h similarity index 94% rename from gfx/fonts/d3d_font.h rename to gfx/font_d3d_driver.h index b84e17a63c..3cc0074d47 100644 --- a/gfx/fonts/d3d_font.h +++ b/gfx/font_d3d_driver.h @@ -14,12 +14,12 @@ * If not, see . */ -#ifndef D3D_FONT_H__ -#define D3D_FONT_H__ +#ifndef __FONT_D3D_DRIVER_H__ +#define __FONT_D3D_DRIVER_H__ #include #include -#include "../../driver.h" +#include "../driver.h" #ifdef __cplusplus extern "C" { diff --git a/gfx/fonts/gl_font.c b/gfx/font_gl_driver.c similarity index 96% rename from gfx/fonts/gl_font.c rename to gfx/font_gl_driver.c index a534b92548..1d12ca4786 100644 --- a/gfx/fonts/gl_font.c +++ b/gfx/font_gl_driver.c @@ -14,8 +14,8 @@ * If not, see . */ -#include "gl_font.h" -#include "../../general.h" +#include "font_gl_driver.h" +#include "../general.h" static const gl_font_renderer_t *gl_font_backends[] = { #if defined(HAVE_LIBDBGFONT) diff --git a/gfx/fonts/gl_font.h b/gfx/font_gl_driver.h similarity index 94% rename from gfx/fonts/gl_font.h rename to gfx/font_gl_driver.h index 15f05d8902..c710dd2132 100644 --- a/gfx/fonts/gl_font.h +++ b/gfx/font_gl_driver.h @@ -14,10 +14,10 @@ * If not, see . */ -#ifndef GL_FONT_H__ -#define GL_FONT_H__ +#ifndef __FONT_GL_DRIVER_H__ +#define __FONT_GL_DRIVER_H__ -#include "../../driver.h" +#include "../driver.h" #include struct font_glyph; @@ -41,4 +41,3 @@ bool gl_font_init_first(const gl_font_renderer_t **font_driver, const char *font_path, float font_size); #endif - diff --git a/gfx/fonts/d3d_w32_font.cpp b/gfx/fonts/d3d_w32_font.cpp index 4771d631de..bb32272272 100644 --- a/gfx/fonts/d3d_w32_font.cpp +++ b/gfx/fonts/d3d_w32_font.cpp @@ -15,7 +15,7 @@ */ #include "../d3d/d3d.h" -#include "d3d_font.h" +#include "../font_d3d_driver.h" #include "../gfx_common.h" #include "../../general.h" diff --git a/gfx/fonts/fonts.c b/gfx/fonts/fonts.c index d804fabfdd..e4a433c1f8 100644 --- a/gfx/fonts/fonts.c +++ b/gfx/fonts/fonts.c @@ -64,4 +64,3 @@ bool font_renderer_create_default( *handle = NULL; return false; } - diff --git a/gfx/fonts/xdk1_xfonts.c b/gfx/fonts/xdk1_xfonts.c index 67d5f36c7b..e72479ef2e 100644 --- a/gfx/fonts/xdk1_xfonts.c +++ b/gfx/fonts/xdk1_xfonts.c @@ -15,7 +15,7 @@ */ #include -#include "d3d_font.h" +#include "../font_d3d_driver.h" #include "../gfx_common.h" #include "../../general.h" diff --git a/gfx/fonts/xdk360_fonts.cpp b/gfx/fonts/xdk360_fonts.cpp index 15e05f17a9..436f3054a3 100644 --- a/gfx/fonts/xdk360_fonts.cpp +++ b/gfx/fonts/xdk360_fonts.cpp @@ -15,7 +15,7 @@ */ #include -#include "d3d_font.h" +#include "../font_d3d_driver.h" #include "../d3d/d3d.h" #include "../gfx_common.h" #include "../../general.h" diff --git a/gfx/gl_common.h b/gfx/gl_common.h index 85f392ee8e..9ad877af39 100644 --- a/gfx/gl_common.h +++ b/gfx/gl_common.h @@ -21,7 +21,7 @@ #include "fonts/fonts.h" #include #include -#include "fonts/gl_font.h" +#include "font_gl_driver.h" #include "image/image.h" #include "video_shader_driver.h" diff --git a/gfx/video_thread_wrapper.h b/gfx/video_thread_wrapper.h index 6f53f2d406..7983505f6a 100644 --- a/gfx/video_thread_wrapper.h +++ b/gfx/video_thread_wrapper.h @@ -21,7 +21,7 @@ #include "../general.h" #include #include -#include "fonts/gl_font.h" +#include "font_gl_driver.h" enum thread_cmd { diff --git a/griffin/griffin.c b/griffin/griffin.c index 510531eb43..2239987616 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -249,11 +249,11 @@ FONTS #endif #ifdef HAVE_OPENGL -#include "../gfx/fonts/gl_font.c" +#include "../gfx/font_gl_driver.c" #endif #if defined(_XBOX) || defined(HAVE_WIN32_D3D9) -#include "../gfx/fonts/d3d_font.c" +#include "../gfx/font_d3d_driver.c" #endif #if defined(HAVE_WIN32_D3D9)