Merge pull request #5841 from orbea/revert-5824-retroarch-assets-makefile

Revert "Use RetroArch Assets' Makefile to install Assets"
This commit is contained in:
Twinaphex 2017-12-01 15:49:12 +01:00 committed by GitHub
commit 64ef42c9f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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