AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-30 15:31:34 +00:00
Code Issues Projects Releases Wiki Activity

gsk: Have variables for resources

Browse Source 
Instead of relying on --generate-dependencies and the resource file,
actually list the resources in Make variables.

Fixes make not building new shaders because they're not inside the
resource file.
This commit is contained in:
Benjamin Otte 2017-01-05 13:11:02 +01:00
parent 33a6347766
commit 078902e8b0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gsk/Makefile.am
View File

@ -55,6 +55,10 @@ gsk_private_vulkan_source_c = \
gskvulkanrenderer.c \
gskvulkanrenderpass.c \
gskvulkanshader.c
gsk_private_vulkan_shaders = \
resources/vulkan/*.glsl
gsk_private_vulkan_compiled_shaders = \
$(gsk_private_vulkan_shaders:.glsl=.spv)
endif
gsk_public_source_h = \
@ -79,6 +83,8 @@ gsk_private_source_h = \
gskroundedrectprivate.h \
gskshaderbuilderprivate.h \
gsktextureprivate.h
gsk_private_source_shaders = \
resources/glsl/*.glsl
gsk_public_source_c = \
gskrenderer.c \
gskrendernode.c \
@ -138,15 +144,15 @@ gsk.resources.xml: Makefile.am
$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
echo "<gresources>" >> $@; \
echo " <gresource prefix='/org/gtk/libgsk'>" >> $@; \
for f in $(top_srcdir)/gsk/resources/glsl/*; do \
for f in $(gsk_private_source_shaders); do \
n=`basename $$f`; \
echo " <file alias='glsl/$$n'>resources/glsl/$$n</file>" >> $@; \
done; \
for f in $(top_srcdir)/gsk/resources/vulkan/*.spv; do \
for f in $(gsk_private_vulkan_compiled_shaders); do \
n=`basename $$f`; \
echo " <file alias='vulkan/$$n'>resources/vulkan/$$n</file>" >> $@; \
done; \
for f in $(top_srcdir)/gsk/resources/vulkan/*.glsl; do \
for f in $(gsk_private_vulkan_shaders); do \
n=`basename $$f`; \
echo " <file alias='vulkan/$$n'>resources/vulkan/$$n</file>" >> $@; \
done; \