minor font2glyphmap fixes

jtsiomb · Jul 2, 2018 · 788e5ea · 788e5ea
1 parent 4d94692
commit 788e5ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/tools/font2glyphmap/Makefile b/tools/font2glyphmap/Makefile
@@ -8,16 +8,11 @@ CFLAGS = -pedantic -Wall -g -I../../src
 LDFLAGS = -L../.. -Wl,-rpath=../.. -ldrawtext
 
 sys := $(shell uname -s | sed 's/MINGW.*/mingw/')
-ifeq ($(sys), Darwin)
-	lib_so = libdrawtext.dylib
-else ifeq ($(sys), mingw)
-	lib_so = libdrawtext.dll
+ifeq ($(sys), mingw)
 	LDFLAGS += -lopengl32 -lglu32 -lfreetype
-else
-	lib_so = libdrawtext.so.0.3
 endif
 
-$(bin): $(obj) ../../$(lib_so) $(font)
+$(bin): $(obj) $(font)
 	$(CC) -o $@ $(obj) $(LDFLAGS)
 
 .PHONY: clean

diff --git a/tools/font2glyphmap/src/font2glyphmap.c b/tools/font2glyphmap/src/font2glyphmap.c
@@ -136,7 +136,7 @@ void print_usage(const char *argv0)
 	printf("  -range <low>-<high>: unicode range (default: ascii)\n");
 	printf("  -dist: convert to distance field glyphmap\n");
 	printf("  -scale <factor>: scale the glyphmap by factor before saving it\n");
-	printf("  -pad <pixels>: padding to leave between glyphs\n");
+	printf("  -padding <pixels>: padding to leave between glyphs\n");
 	printf("  -o <filename>: output filename\n");
 	printf("  -help: print usage information and exit\n");
 }