fixed compile errors

This commit is contained in:
Amy G. Bowersox 2019-12-07 23:37:21 -07:00
parent 30106490c0
commit 6af1c1c058
4 changed files with 6 additions and 2 deletions

View File

@ -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 log.o gpio.o msg_queue.o time_func.o config.o splash.o
LIBS=-lpython3.7m -lcrypt -lfreetype -lbcm2835 -lpthread -ldl -lutil -lm LIBS=-lpython3.7m -lcrypt -lfreetype -lbcm2835 -lpthread -ldl -lutil -lm
CFLAGS=-I/usr/include/python3.7m -I/usr/include/freetype2 -I/usr/include/libpng16 \ CFLAGS=-I/usr/include/python3.7m -I/usr/include/freetype2 -I/usr/include/libpng16 \

View File

@ -1,6 +1,9 @@
#include <string.h>
#include <alloca.h> #include <alloca.h>
#include "wintype.h" #include "wintype.h"
#include "fbinit.h" #include "fbinit.h"
#include "fontengine.h"
#include "fbprimitive.h"
inline static PUINT16 loc_from_coords(INT32 x, INT32 y) inline static PUINT16 loc_from_coords(INT32 x, INT32 y)
{ {

View File

@ -5,7 +5,7 @@
#include "log.h" #include "log.h"
#include "fontengine.h" #include "fontengine.h"
static FT_LIbrary library; static FT_Library library;
static FT_Face stdfont; static FT_Face stdfont;
static void fonteng_cleanup(void) static void fonteng_cleanup(void)

View File

@ -7,6 +7,7 @@
#include "log.h" #include "log.h"
#include "fbinit.h" #include "fbinit.h"
#include "fbprimitive.h" #include "fbprimitive.h"
#include "fontengine.h"
#include "time_func.h" #include "time_func.h"
#include "ep_init.h" #include "ep_init.h"
#include "sysinput.h" #include "sysinput.h"