libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 02:00:41 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Update default shader dir - becomes media/shaders_cg

Browse Source
This commit is contained in:
twinaphex 2014-10-29 07:44:06 +01:00
parent 82f4f1a83a
commit 557d2472df
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.griffin
View File

@ -40,7 +40,7 @@ INCLUDE :=
LDFLAGS :=
LIBDIRS :=
SHADER_DIR := media/shaders
SHADER_CG_DIR := media/shaders_cg
OVERLAY_DIR := media/overlays
SHADER_GLSL_DIR := media/shaders_glsl
@ -239,20 +239,20 @@ else ifeq ($(platform), psp1)
endif
shaders-checkout:
@if test -d $(SHADER_DIR); then \
@if test -d $(SHADER_CG_DIR); then \
echo "[SHADER CHECKOUT::] Git pulling common-shaders..."; \
cd $(SHADER_DIR); \
cd $(SHADER_CG_DIR); \
$(GIT) pull; \
cd ../../../../..; \
else \
echo "[SHADER CHECKOUT::] Git cloning common-shaders first..."; \
$(GIT) clone git://github.com/libretro/common-shaders.git $(SHADER_DIR); \
$(GIT) clone git://github.com/libretro/common-shaders.git $(SHADER_CG_DIR); \
fi
shaders-deploy:
ifeq ($(platform), ps3)
@if test -d $(MEDIA_SHADER_DIR); then \
cp -r $(SHADER_DIR)/* $(MEDIA_SHADER_DIR); \
cp -r $(SHADER_CG_DIR)/* $(MEDIA_SHADER_DIR); \
else \
echo "[DEPLOY PS3::] Creating PS3 shader directory first..."; \
mkdir -p $(MEDIA_SHADER_DIR) || bin/true; \
@ -260,7 +260,7 @@ ifeq ($(platform), ps3)
@echo "[DEPLOY PS3::] Copied shaders to PS3 shaders directory."
else ifeq ($(platform), ps3-cobra)
@if test -d $(MEDIA_SHADER_DIR); then \
cp -r $(SHADER_DIR)/* $(MEDIA_SHADER_DIR); \
cp -r $(SHADER_CG_DIR)/* $(MEDIA_SHADER_DIR); \
else \
echo "[DEPLOY PS3::] Creating PS3 shader directory first..."; \
mkdir -p $(MEDIA_SHADER_DIR) || bin/true; \
@ -269,7 +269,7 @@ else ifeq ($(platform), ps3-cobra)
endif
shaders-convert-glsl:
$(PYTHON3) tools/cg2glsl.py $(SHADER_DIR) $(SHADER_GLSL_DIR)
$(PYTHON3) tools/cg2glsl.py $(SHADER_CG_DIR) $(SHADER_GLSL_DIR)
overlays-checkout:
@if test -d $(OVERLAY_DIR); then \

2
frontend/platform/platform_ps3.c
View File

@ -202,7 +202,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
fill_pathname_join(g_defaults.system_dir, g_defaults.core_dir,
"system", sizeof(g_defaults.system_dir));
fill_pathname_join(g_defaults.shader_dir, g_defaults.core_dir,
"shaders", sizeof(g_defaults.shader_dir));
"shaders_cg", sizeof(g_defaults.shader_dir));
fill_pathname_join(g_defaults.config_path, g_defaults.port_dir,
"retroarch.cfg", sizeof(g_defaults.config_path));
fill_pathname_join(g_defaults.overlay_dir, g_defaults.core_dir,