mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only build video_shader_parse.c if HAVE_GLSL, HAVE_CG, HAVE_SLANG,

Browse Source 
and/or HAVE_HLSL is defined
This commit is contained in:
twinaphex 2019-07-20 16:50:46 +02:00
parent 8fe7e3f730
commit d91905dd75
2 changed files with 19 additions and 1 deletions

18
Makefile.common

@ -241,7 +241,6 @@ OBJ += \
tasks/task_screenshot.o \ tasks/task_screenshot.o \
tasks/task_powerstate.o \ tasks/task_powerstate.o \
$(LIBRETRO_COMM_DIR)/gfx/scaler/scaler.o \ $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler.o \
gfx/video_shader_parse.o \
$(LIBRETRO_COMM_DIR)/gfx/scaler/pixconv.o \ $(LIBRETRO_COMM_DIR)/gfx/scaler/pixconv.o \
$(LIBRETRO_COMM_DIR)/gfx/scaler/scaler_int.o \ $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler_int.o \
$(LIBRETRO_COMM_DIR)/gfx/scaler/scaler_filter.o \ $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler_filter.o \
@ -1317,11 +1316,28 @@ ifeq ($(HAVE_XVIDEO), 1)
endif endif
ifeq ($(HAVE_CG), 1) ifeq ($(HAVE_CG), 1)
HAVE_SHADERS_COMMON = 1
DEFINES += -DHAVE_CG DEFINES += -DHAVE_CG
OBJ += gfx/drivers_shader/shader_gl_cg.o OBJ += gfx/drivers_shader/shader_gl_cg.o
LIBS += $(CG_LIBS) LIBS += $(CG_LIBS)
endif endif
ifeq ($(HAVE_GLSL), 1)
HAVE_SHADERS_COMMON = 1
endif
ifeq ($(HAVE_HLSL),1)
HAVE_SHADERS_COMMON = 1
endif
ifeq ($(HAVE_SLANG),1)
HAVE_SHADERS_COMMON = 1
endif
ifeq ($(HAVE_SHADERS_COMMON), 1)
OBJ += gfx/video_shader_parse.o
endif
ifeq ($(HAVE_D3D9), 1) ifeq ($(HAVE_D3D9), 1)
HAVE_D3D_COMMON = 1 HAVE_D3D_COMMON = 1
DEFINES += -DHAVE_D3D9 DEFINES += -DHAVE_D3D9

2
griffin/griffin.c

@ -297,7 +297,9 @@ VIDEO CONTEXT
/*============================================================ /*============================================================
VIDEO SHADERS VIDEO SHADERS
============================================================ */ ============================================================ */
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) || defined(HAVE_SLANG)
#include "../gfx/video_shader_parse.c" #include "../gfx/video_shader_parse.c"
#endif
#ifdef HAVE_CG #ifdef HAVE_CG
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL