From cfc5affece5e5718a836ff5b103be0bbfeeddc29 Mon Sep 17 00:00:00 2001 From: Mattia Basaglia Date: Fri, 8 Nov 2013 18:42:21 +0100 Subject: [PATCH] Fix twilight eye + Makefile hax --- Main6/twilight-alicorn.colored.txt | 8 ++++---- Main6/twilight-alicorn/30;1 | 6 +++--- Main6/twilight-alicorn/35;22 | 8 ++++---- Main6/twilight-alicorn/37;22 | 8 ++++---- Main6/twilight-unicorn.colored.txt | 8 ++++---- Main6/twilight-unicorn.plain.txt | 10 +++++----- Main6/twilight-unicorn/30;1 | 6 +++--- Main6/twilight-unicorn/35;22 | 8 ++++---- Main6/twilight-unicorn/37;22 | 10 +++++----- Makefile | 24 ++++++++++++------------ 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Main6/twilight-alicorn.colored.txt b/Main6/twilight-alicorn.colored.txt index 8a07fda..e700929 100644 --- a/Main6/twilight-alicorn.colored.txt +++ b/Main6/twilight-alicorn.colored.txt @@ -4,10 +4,10 @@ ( / \_ `.' / `. | | ) `;. ,' / \ \ ( '. /___/_j_ / ) | ) - '\ / __\ ``::'/__' | - |\_ ( / .-| |-.| `-,| - .| ( \ ( (WW| \W)j ' - ..-----, .|' ', \_\_`_| ``-. + '\ / __\``::'/__' | + |\_ ( / .-| |-.| `-,| + .| ( \ ( (WW| \W)j ' + ..-----, .|' ', \_\_`_| ``-. .-` ..::. `,___ |, ._:7 \__/ ,' .:::'':::.|.`.`-. |:'. \ ______.-' .' .::' '::\`.`. `-._| \ \ `"7 / diff --git a/Main6/twilight-alicorn/30;1 b/Main6/twilight-alicorn/30;1 index 5c8746b..8758f4e 100644 --- a/Main6/twilight-alicorn/30;1 +++ b/Main6/twilight-alicorn/30;1 @@ -5,7 +5,7 @@ - .- - (WW W - ` + .- + (WW W + ` \ No newline at end of file diff --git a/Main6/twilight-alicorn/35;22 b/Main6/twilight-alicorn/35;22 index 606c860..c368760 100644 --- a/Main6/twilight-alicorn/35;22 +++ b/Main6/twilight-alicorn/35;22 @@ -4,10 +4,10 @@ ( / \_ `.' / | | ,' / \ ( '. / ) | - \ __ /__' - \_ / -. ` - ( ) - . \ ``-. + \ __ /__' + \_ / -. ` + ( ) + . \ ``-. ..::. ___ |, \__/ .:::'':::.|.`.`-. :'. ______.-' .::' '::\`.`. `-._ \ \ / diff --git a/Main6/twilight-alicorn/37;22 b/Main6/twilight-alicorn/37;22 index 85d7e31..691c19e 100644 --- a/Main6/twilight-alicorn/37;22 +++ b/Main6/twilight-alicorn/37;22 @@ -4,7 +4,7 @@ _ - / \ - ( | | | - \ | \ j - \_ _ _| + / \ + ( | | | + \ | \ j + \_ _ _| diff --git a/Main6/twilight-unicorn.colored.txt b/Main6/twilight-unicorn.colored.txt index 46b1915..58fa1fe 100644 --- a/Main6/twilight-unicorn.colored.txt +++ b/Main6/twilight-unicorn.colored.txt @@ -4,10 +4,10 @@ ( / \_ `.' / `. | | ) `;. ,' / \ \ ( '. /___/_j_ / ) | ) - '\ / __\ ``::'/__' | - |\_ ( / .-| |-.| `-,| - .| ( \ ( (WW| \W)j ' - ..-----, .|' ', \_\_`_| ``-. + '\ / __\``::'/__' | + |\_ ( / .-| |-.| `-,| + .| ( \ ( (WW| \) j ' + ..-----, .|' ', \_\_`_| ``-. .-` ..::. `, |, ._:7 \__/ ,' .:::'':::. \ |:'. \ ______.-' .' .::' ':: :._______| \ \ `"7 / diff --git a/Main6/twilight-unicorn.plain.txt b/Main6/twilight-unicorn.plain.txt index f8eebb2..c3bb4f6 100644 --- a/Main6/twilight-unicorn.plain.txt +++ b/Main6/twilight-unicorn.plain.txt @@ -1,13 +1,13 @@ - +xfffxxxxx c __ _____ _ / \__..--"" ;-.",'/ ( / \_ `.' / `. | | ) `;. ,' / \ \ ( '. /___/_j_ / ) | ) - '\ / __\ ``::'/__' | - |\_ ( / .-| |-.| `-,| - .| ( \ ( (WW| \W)j ' - ..-----, .|' ', \_\_`_| ``-. + '\ / __ \``::'/__' | + |\_ ( / .- | |-.| `-,| + .| ( \ ((WW | \W)j ' + ..-----, .|' ', \_ _ _| ``-. .-` ..::. `, |, ._:7 \__/ ,' .:::'':::. \ |:'. \ ______.-' .' .::' ':: :._______| \ \ `"7 / diff --git a/Main6/twilight-unicorn/30;1 b/Main6/twilight-unicorn/30;1 index 5c8746b..8758f4e 100644 --- a/Main6/twilight-unicorn/30;1 +++ b/Main6/twilight-unicorn/30;1 @@ -5,7 +5,7 @@ - .- - (WW W - ` + .- + (WW W + ` \ No newline at end of file diff --git a/Main6/twilight-unicorn/35;22 b/Main6/twilight-unicorn/35;22 index 507d24a..050aad4 100644 --- a/Main6/twilight-unicorn/35;22 +++ b/Main6/twilight-unicorn/35;22 @@ -4,10 +4,10 @@ ( / \_ `.' / | | ,' / \ ( '. / ) | - \ __ /__' - \_ / -. ` - ( ) - . \ ``-. + \ __ /__' + \_ / -. ` + ( ) + . \ ``-. ..::. |, \__/ .:::'':::. :'. ______.-' .::' ':: :._______ \ \ / diff --git a/Main6/twilight-unicorn/37;22 b/Main6/twilight-unicorn/37;22 index 85d7e31..c92a4ab 100644 --- a/Main6/twilight-unicorn/37;22 +++ b/Main6/twilight-unicorn/37;22 @@ -1,10 +1,10 @@ - + _ - / \ - ( | | | - \ | \ j - \_ _ _| + / \ + ( | | | + \ | \ j + \_ _ _| diff --git a/Makefile b/Makefile index 60bcc95..c2474b0 100644 --- a/Makefile +++ b/Makefile @@ -13,22 +13,22 @@ PONIES= Main6/applejack-nohat \ SCRIPT=$(PWD)/render_parts.php OUT_PLAIN=$(addsuffix .plain.txt,$(PONIES)) OUT_COLOR=$(addsuffix .colored.txt,$(PONIES)) -find_deps=$(subst ;,\;,$(wildcard $(1)/*)) - -.PHONY: show +find_deps=$(subst ;,\\\;,$(wildcard $(1)/*)) all: $(OUT_COLOR) $(OUT_PLAIN) +define rule_template +$(1).colored.txt: $(call find_deps, $(1)) + $(SCRIPT) $(1) >$(1).colored.txt -# %.colored.txt : $(SCRIPT) -# %.colored.txt : $(PWD)/Makefile -%.colored.txt : $(call find_deps, $*) - $(SCRIPT) $* >$*.colored.txt +$(1).plain.txt: $(call find_deps, $(1)) + $(SCRIPT) $(1) >$(1).plain.txt nocolor +endef -# %.plain.txt : $(SCRIPT) -# %.plain.txt : $(PWD)/Makefile -%.plain.txt : $(call find_deps, $*) - $(SCRIPT) $* >$*.plain.txt nocolor +$(foreach pony,$(PONIES),$(eval $(call rule_template,$(pony)))) show: $(PONY).colored.txt - @cat $(PONY).colored.txt \ No newline at end of file + @cat $(PONY).colored.txt + +show_deps: + @$(foreach d,$(call find_deps,$(PONY)), echo $(d);) \ No newline at end of file