Merge pull request #42 from dougfelt/master

Minor tweaks to quiet makefile and fix bug in add_glyphs.
This commit is contained in:
dougfelt 2016-01-28 14:03:49 -08:00
commit 91ef95d0e7
2 changed files with 2 additions and 2 deletions

View file

@ -146,7 +146,7 @@ waveflag: waveflag.c
$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS) $(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
$(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR) $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
echo "emoji $< $@" @echo "emoji $< $@"
@convert -extent 136x128 -gravity center -background none "$<" "$@" @convert -extent 136x128 -gravity center -background none "$<" "$@"
$(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT) | $(FLAGS_DIR) $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT) | $(FLAGS_DIR)

View file

@ -112,7 +112,7 @@ for img_prefix in img_prefixen:
codes = img_file[len (img_prefix):-4] codes = img_file[len (img_prefix):-4]
u = codes_to_string(codes) u = codes_to_string(codes)
if u in img_files: if u in img_files:
print 'overwriting %s with %s' % (img_files[u], imag_file) print 'overwriting %s with %s' % (img_files[u], img_file)
img_files[u] = img_file img_files[u] = img_file
if not img_files: if not img_files:
raise Exception ("No image files found in '%s'." % glb) raise Exception ("No image files found in '%s'." % glb)