[Scummvm-git-logs] scummvm master -> 7bec7b7d3186569cd35970bcc6b21d1233eabfe4

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7bec7b7d31 CONFIGURE: Also install shaders if gles2 enabled (#2513)


Commit: 7bec7b7d3186569cd35970bcc6b21d1233eabfe4
    https://github.com/scummvm/scummvm/commit/7bec7b7d3186569cd35970bcc6b21d1233eabfe4
Author: LMerckx (laurent-merckx at skynet.be)
Date: 2020-10-12T18:26:41+02:00

Commit Message:
CONFIGURE: Also install shaders if gles2 enabled (#2513)

CONFIGURE: Also install shaders if gles2 enabled

Changed paths:
    Makefile.common
    ports.mk


diff --git a/Makefile.common b/Makefile.common
index 4cb2c1e7e2..0fa6849d45 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -440,9 +440,9 @@ ifdef ENABLE_AGI
 DIST_FILES_ENGINEDATA+=$(srcdir)/dists/pred.dic
 endif
 
-# Shaders
+# Shaders: install if USE_OPENGL_SHADERS or USE_GLES2 defined
 DIST_FILES_SHADERS=
-ifdef USE_OPENGL_SHADERS
+ifneq ($(USE_OPENGL_SHADERS)$(USE_GLES2),)
 ifdef ENABLE_GRIM
 DIST_FILES_SHADERS+=$(wildcard $(srcdir)/engines/grim/shaders/*)
 endif
diff --git a/ports.mk b/ports.mk
index 00684cab5e..950dde9a76 100644
--- a/ports.mk
+++ b/ports.mk
@@ -22,7 +22,7 @@ install:
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/metainfo"
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.appdata.xml" "$(DESTDIR)$(datarootdir)/metainfo/scummvm.appdata.xml"
-ifdef USE_OPENGL_SHADERS
+ifneq ($(DIST_FILES_SHADERS),)
 	$(INSTALL) -d "$(DESTDIR)$(datadir)/shaders"
 	$(INSTALL) -c -m 644 $(DIST_FILES_SHADERS) "$(DESTDIR)$(datadir)/shaders"
 endif
@@ -48,7 +48,7 @@ install-strip:
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/metainfo"
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.appdata.xml" "$(DESTDIR)$(datarootdir)/metainfo/scummvm.appdata.xml"
-ifdef USE_OPENGL_SHADERS
+ifneq ($(DIST_FILES_SHADERS),)
 	$(INSTALL) -d "$(DESTDIR)$(datadir)/shaders"
 	$(INSTALL) -c -m 644 $(DIST_FILES_SHADERS) "$(DESTDIR)$(datadir)/shaders"
 endif
@@ -135,7 +135,7 @@ endif
 ifdef DIST_FILES_VKEYBD
 	cp $(DIST_FILES_VKEYBD) $(bundle_name)/Contents/Resources/
 endif
-ifdef USE_OPENGL_SHADERS
+ifneq ($(DIST_FILES_SHADERS),)
 	mkdir -p $(bundle_name)/Contents/Resources/shaders
 	cp $(DIST_FILES_SHADERS) $(bundle_name)/Contents/Resources/shaders/
 endif
@@ -150,7 +150,7 @@ endif
 	cp $(bundle_name)/Contents/Resources/COPYING.OFL $(bundle_name)/Contents/Resources/COPYING-OFL
 	cp $(bundle_name)/Contents/Resources/COPYING.BSD $(bundle_name)/Contents/Resources/COPYING-BSD
 	chmod 644 $(bundle_name)/Contents/Resources/*
-ifdef USE_OPENGL_SHADERS
+ifneq ($(DIST_FILES_SHADERS),)
 	chmod 755 $(bundle_name)/Contents/Resources/shaders
 endif
 	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm