From 96f94a2891eeaa4b486de2c174ed8c00fcf0d271 Mon Sep 17 00:00:00 2001 From: Walter Barrett Date: Sat, 7 Oct 2017 00:23:34 -0400 Subject: [PATCH] Fix compiling GLSL shaders under Windows. Now the `sed` command cope with files using Windows-style line endings. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 464ad3c4..de2b3526 100644 --- a/Makefile +++ b/Makefile @@ -1183,7 +1183,7 @@ define DO_REF_STR $(echo_cmd) "REF_STR $<" $(Q)rm -f $@ $(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@ -$(Q)cat $< | sed 's/^/\"/;s/$$/\\n\"/' >> $@ +$(Q)cat $< | sed -e 's/^/\"/;s/$$/\\n\"/' -e 's/\r//g' >> $@ $(Q)echo ";" >> $@ endef