Changeset 1453


Ignore:
Timestamp:
Jun 11, 2012, 11:21:39 PM (7 years ago)
Author:
sam
Message:

build: remove \r from shader files before compilation.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/orbital/Makefile.am

    r1424 r1453  
    4545        echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp
    4646        echo "char const *lolfx_$(notdir $(^:%.lolfx=%)) =" >> $@.tmp
    47         $(SED) 's/"/\\"/g' $^ | $(SED) 's/.*/"&\\n"/' >> $@.tmp
     47        $(SED) 's/"/\\"/g' $^ | $(SED) 's/\([^\r]*\).*/"\1\\n"/' >> $@.tmp
    4848        echo ";" >> $@.tmp
    4949        mv $@.tmp $@
  • trunk/src/Makefile.am

    r1449 r1453  
    5858        echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp
    5959        echo "char const *lolfx_$(notdir $(^:%.lolfx=%)) =" >> $@.tmp
    60         $(SED) 's/"/\\"/g' $^ | $(SED) 's/.*/"&\\n"/' >> $@.tmp
     60        $(SED) 's/"/\\"/g' $^ | $(SED) 's/\([^\r]*\).*/"\1\\n"/' >> $@.tmp
    6161        echo ";" >> $@.tmp
    6262        mv $@.tmp $@
  • trunk/test/tutorial/Makefile.am

    r1403 r1453  
    1616        echo "/* This file was autogenerated. DO NOT MODIFY IT. */" > $@.tmp
    1717        echo "char const *lolfx_$(notdir $(^:%.lolfx=%)) =" >> $@.tmp
    18         $(SED) 's/"/\\"/g' $^ | $(SED) 's/.*/"&\\n"/' >> $@.tmp
     18        $(SED) 's/"/\\"/g' $^ | $(SED) 's/\([^\r]*\).*/"\1\\n"/' >> $@.tmp
    1919        echo ";" >> $@.tmp
    2020        mv $@.tmp $@
Note: See TracChangeset for help on using the changeset viewer.