Skip to content

Commit

Permalink
Merge pull request libretro#5841 from orbea/revert-5824-retroarch-ass…
Browse files Browse the repository at this point in the history
…ets-makefile

Revert "Use RetroArch Assets' Makefile to install Assets"
  • Loading branch information
inactive123 authored Dec 1, 2017
2 parents 8e81b04 + 5d5aa7c commit 64ef42c
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,17 @@ install: $(TARGET)
install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
@if test -d media/assets; then \
echo "Installing media assets..."; \
$(MAKE) install -C media/assets INSTALLDIR=$(ASSETS_DIR)/retroarch/assets; \
mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb; \
mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/glui; \
cp -r media/assets/xmb/ $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
echo "Removing unneeded source image files.."; \
rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/flatui/src; \
rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/monochrome/src; \
rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive/src; \
rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/neoactive/src; \
rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retrosystem/src; \
rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/dot-art/src; \
echo "Asset copying done."; \
fi

Expand Down

0 comments on commit 64ef42c

Please sign in to comment.