Browse Source

build: remove \r from shader files before compilation.

legacy
Sam Hocevar sam 12 years ago
parent
commit
4a938d239b
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      src/Makefile.am
  2. +1
    -1
      test/tutorial/Makefile.am

+ 1
- 1
src/Makefile.am View File

@@ -57,7 +57,7 @@ SUFFIXES = .lolfx
%.lolfx.cpp: %.lolfx %.lolfx.cpp: %.lolfx
echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp
echo "char const *lolfx_$(notdir $(^:%.lolfx=%)) =" >> $@.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 echo ";" >> $@.tmp
mv $@.tmp $@ mv $@.tmp $@




+ 1
- 1
test/tutorial/Makefile.am View File

@@ -15,7 +15,7 @@ SUFFIXES = .lolfx
%.lolfx.cpp: %.lolfx %.lolfx.cpp: %.lolfx
echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp
echo "char const *lolfx_$(notdir $(^:%.lolfx=%)) =" >> $@.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 echo ";" >> $@.tmp
mv $@.tmp $@ mv $@.tmp $@




Loading…
Cancel
Save