From 6af1c1c0588b16e5d628cf6b092675966fb5916d Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Sat, 7 Dec 2019 23:37:21 -0700 Subject: [PATCH] fixed compile errors --- src/Makefile | 2 +- src/fbprimitive.c | 3 +++ src/fontengine.c | 2 +- src/main.c | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index b757ace..835818e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -OBJS=main.o sysinput.o ep_init.o ep_upiwin.o ep_backlight.o ep_upiwin_tmp.o ep_util.o fbinit.o fontengine.o 6fbprimitive.o \ +OBJS=main.o sysinput.o ep_init.o ep_upiwin.o ep_backlight.o ep_upiwin_tmp.o ep_util.o fbinit.o fontengine.o fbprimitive.o \ log.o gpio.o msg_queue.o time_func.o config.o splash.o LIBS=-lpython3.7m -lcrypt -lfreetype -lbcm2835 -lpthread -ldl -lutil -lm CFLAGS=-I/usr/include/python3.7m -I/usr/include/freetype2 -I/usr/include/libpng16 \ diff --git a/src/fbprimitive.c b/src/fbprimitive.c index 72d1ad0..325ef2f 100644 --- a/src/fbprimitive.c +++ b/src/fbprimitive.c @@ -1,6 +1,9 @@ +#include #include #include "wintype.h" #include "fbinit.h" +#include "fontengine.h" +#include "fbprimitive.h" inline static PUINT16 loc_from_coords(INT32 x, INT32 y) { diff --git a/src/fontengine.c b/src/fontengine.c index f8bfd7f..6ed7ec7 100644 --- a/src/fontengine.c +++ b/src/fontengine.c @@ -5,7 +5,7 @@ #include "log.h" #include "fontengine.h" -static FT_LIbrary library; +static FT_Library library; static FT_Face stdfont; static void fonteng_cleanup(void) diff --git a/src/main.c b/src/main.c index 957b5a0..21e8622 100644 --- a/src/main.c +++ b/src/main.c @@ -7,6 +7,7 @@ #include "log.h" #include "fbinit.h" #include "fbprimitive.h" +#include "fontengine.h" #include "time_func.h" #include "ep_init.h" #include "sysinput.h"