cappy4king
/
marseymoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from davispuh/patch-1 

Quote $PNGQUANTDIR and $PNGQUANT
pull/10/head
Behdad Esfahbod 2015-06-24 15:24:29 -07:00
parent 8839dc42e1 b257b6647d
commit e2cb07c427
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -22,8 +22,8 @@ PNGQUANTDIR := $(abspath `pwd`/../third_party/pngquant)
PNGQUANT := $(PNGQUANTDIR)/pngquant PNGQUANT := $(PNGQUANTDIR)/pngquant
PNGQUANTFLAGS = --speed 1 --skip-if-larger --ext '.png' --force PNGQUANTFLAGS = --speed 1 --skip-if-larger --ext '.png' --force
$(PNGQUANT): "$(PNGQUANT)":
cd $(PNGQUANTDIR) && make cd "$(PNGQUANTDIR)" && make
waveflag: waveflag.c waveflag: waveflag.c
$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS) $(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
@ -64,11 +64,11 @@ GLYPH_NAMES := $(shell ./flag_glyph_name.py $(FLAGS))
WAVED_FLAGS := $(foreach flag,$(FLAGS),$(FLAGS_DIR)/$(flag).png) WAVED_FLAGS := $(foreach flag,$(FLAGS),$(FLAGS_DIR)/$(flag).png)
PNG128_FLAGS := $(foreach glyph_name,$(GLYPH_NAMES),$(addprefix ./png/128/emoji_$(glyph_name),.png)) PNG128_FLAGS := $(foreach glyph_name,$(GLYPH_NAMES),$(addprefix ./png/128/emoji_$(glyph_name),.png))
$(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT) $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag "$(PNGQUANT)"
mkdir -p $(FLAGS_DIR) mkdir -p $(FLAGS_DIR)
./waveflag "$<" "$@" ./waveflag "$<" "$@"
optipng -quiet -o7 "$@" optipng -quiet -o7 "$@"
$(PNGQUANT) $(PNGQUANTFLAGS) "$@" "$(PNGQUANT)" $(PNGQUANTFLAGS) "$@"
flag-symlinks: $(WAVED_FLAGS) flag-symlinks: $(WAVED_FLAGS)
$(foreach flag,$(FLAGS),ln -fs ../../flags/$(flag).png ./png/128/emoji_$(glyph_name).png;) $(foreach flag,$(FLAGS),ln -fs ../../flags/$(flag).png ./png/128/emoji_$(glyph_name).png;)