From e7e441d32da7edd0feb4aedce780be1657cbf48f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 2 Oct 2014 15:19:21 +0200 Subject: [PATCH] Rename shader_cg.c to shader_gl_cg.c --- Makefile.common | 2 +- gfx/shader/{shader_cg.c => shader_gl_cg.c} | 2 +- griffin/griffin.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) rename gfx/shader/{shader_cg.c => shader_gl_cg.c} (99%) diff --git a/Makefile.common b/Makefile.common index 7eec2aff99..40f6e197ab 100644 --- a/Makefile.common +++ b/Makefile.common @@ -474,7 +474,7 @@ endif ifeq ($(HAVE_CG), 1) DEFINES += -DHAVE_CG - OBJ += gfx/shader/shader_cg.o + OBJ += gfx/shader/shader_gl_cg.o LIBS += $(CG_LIBS) endif diff --git a/gfx/shader/shader_cg.c b/gfx/shader/shader_gl_cg.c similarity index 99% rename from gfx/shader/shader_cg.c rename to gfx/shader/shader_gl_cg.c index f410df6eeb..f8047fadc8 100644 --- a/gfx/shader/shader_cg.c +++ b/gfx/shader/shader_gl_cg.c @@ -1021,6 +1021,6 @@ const shader_backend_t gl_cg_backend = { gl_cg_get_current_shader, RARCH_SHADER_CG, - "cg" + "gl_cg" }; diff --git a/griffin/griffin.c b/griffin/griffin.c index f67aab3b63..fa04648335 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -152,7 +152,9 @@ VIDEO SHADERS #include "../gfx/shader/shader_null.c" #ifdef HAVE_CG -#include "../gfx/shader/shader_cg.c" +#ifdef HAVE_OPENGL +#include "../gfx/shader/shader_gl_cg.c" +#endif #endif #ifdef HAVE_HLSL