52 lines
1.3 KiB
Plaintext
52 lines
1.3 KiB
Plaintext
--- a/Makefile 2020-09-02 21:15:32.580000000 +0000
|
|
+++ b/Makefile 2020-09-02 22:02:21.720000000 +0000
|
|
@@ -1,15 +1,15 @@
|
|
# fbpad_mkfn makefile
|
|
CC = cc
|
|
|
|
-CFLAGS = -O2 -Wall
|
|
-LDFLAGS =
|
|
+CFLAGS = -O2 -Wall -I/include/freetype2 -static --static
|
|
+LDFLAGS = -lfreetype -lbz2 -lpng -lz
|
|
|
|
all: mkfn_ft mkfn_stb
|
|
%.o: %.c
|
|
$(CC) -c $(CFLAGS) $<
|
|
mkfn_ft: mkfn_ft.c mkfn.o isdw.o
|
|
- $(CC) -c $(CFLAGS) `pkg-config --cflags freetype2` mkfn_ft.c
|
|
- $(CC) -o $@ mkfn_ft.o mkfn.o isdw.o $(LDFLAGS) `pkg-config --libs freetype2`
|
|
+ $(CC) -c $(CFLAGS) mkfn_ft.c
|
|
+ $(CC) -o $@ mkfn_ft.o mkfn.o isdw.o $(LDFLAGS)
|
|
|
|
mkfn_stb: mkfn_stb.c mkfn.o isdw.o
|
|
$(CC) -c $(CFLAGS) -DSTB_TRUETYPE_IMPLEMENTATION mkfn_stb.c
|
|
--- a/mkfn.c 2020-09-02 21:15:32.580000000 +0000
|
|
+++ b/mkfn.c 2020-09-02 22:08:05.230000000 +0000
|
|
@@ -84,6 +84,11 @@
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
+ if (argc <= 1) {
|
|
+ fprintf(stderr, usage);
|
|
+ exit(1);
|
|
+ }
|
|
+
|
|
int i;
|
|
char *wdiff = NULL;
|
|
char *hdiff = NULL;
|
|
@@ -92,9 +97,13 @@
|
|
wdiff = argv[i][2] ? argv[i] + 2 : argv[++i];
|
|
else if (argv[i][1] == 'h')
|
|
hdiff = argv[i][2] ? argv[i] + 2 : argv[++i];
|
|
- else
|
|
+ else {
|
|
+ fprintf(stderr, "unrecognized flag: %s\n", argv[i]);
|
|
fprintf(stderr, usage);
|
|
+ exit(1);
|
|
+ }
|
|
}
|
|
+
|
|
mkfn_init();
|
|
for (; i < argc; i++) {
|
|
char *name = argv[i];
|