From 4a938d239b086b5aca3db814564f8704b5265780 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 11 Jun 2012 21:21:39 +0000 Subject: [PATCH] build: remove \r from shader files before compilation. --- src/Makefile.am | 2 +- test/tutorial/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0c7fa1e6..ee5656a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,7 +57,7 @@ SUFFIXES = .lolfx %.lolfx.cpp: %.lolfx echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp echo "char const *lolfx_$(notdir $(^:%.lolfx=%)) =" >> $@.tmp - $(SED) 's/"/\\"/g' $^ | $(SED) 's/.*/"&\\n"/' >> $@.tmp + $(SED) 's/"/\\"/g' $^ | $(SED) 's/\([^\r]*\).*/"\1\\n"/' >> $@.tmp echo ";" >> $@.tmp mv $@.tmp $@ diff --git a/test/tutorial/Makefile.am b/test/tutorial/Makefile.am index 101fa113..c86ac1f4 100644 --- a/test/tutorial/Makefile.am +++ b/test/tutorial/Makefile.am @@ -15,7 +15,7 @@ SUFFIXES = .lolfx %.lolfx.cpp: %.lolfx echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp echo "char const *lolfx_$(notdir $(^:%.lolfx=%)) =" >> $@.tmp - $(SED) 's/"/\\"/g' $^ | $(SED) 's/.*/"&\\n"/' >> $@.tmp + $(SED) 's/"/\\"/g' $^ | $(SED) 's/\([^\r]*\).*/"\1\\n"/' >> $@.tmp echo ";" >> $@.tmp mv $@.tmp $@