From 7091e23254bf816855a7d20d50f38b3fca4e00de Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 Nov 2015 11:28:25 +0100 Subject: [PATCH] (PS3) Copy GLUI/XMB assets --- Makefile.ps3 | 5 +++-- frontend/drivers/platform_ps3.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index f5e8ec5684..1eac9519e5 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -6,7 +6,7 @@ CELL_BUILD_TOOLS = SNC CELL_GPU_TYPE = RSX CELL_PSGL_VERSION = ultra-opt -RMENU_IMG_DIR := media/rmenu +ASSETS_DIR := media/assets # options DOWNLOAD_SHADERS = 1 @@ -156,7 +156,8 @@ create-salamander: $(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL) copy-media-files: - @cp -r $(RMENU_IMG_DIR)/*.png pkg/ps3/USRDIR/cores/borders/Menu/ + @cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets + @cp -r $(ASSETS_DIR)/xmb pkg/ps3/USRDIR/cores/assets create-shaders: make -f Makefile.griffin platform=ps3 shaders-deploy diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c index f212030d8a..0d86499899 100644 --- a/frontend/drivers/platform_ps3.c +++ b/frontend/drivers/platform_ps3.c @@ -227,7 +227,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[], fill_pathname_join(g_defaults.dir.overlay, g_defaults.dir.core, "overlays", sizeof(g_defaults.dir.overlay)); fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.core, - "media", sizeof(g_defaults.dir.assets)); + "assets", sizeof(g_defaults.dir.assets)); fill_pathname_join(g_defaults.dir.playlist, g_defaults.dir.core, "playlists", sizeof(g_defaults.dir.playlist)); }