From ec2ae1d07cd6e4d112163e16887e9d0651206faf Mon Sep 17 00:00:00 2001 From: Mike Iannacone Date: Wed, 21 Jul 2021 18:21:30 -0400 Subject: [PATCH 1/2] create obj dir in Makefile --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 81ee16f..91f1d09 100644 --- a/Makefile +++ b/Makefile @@ -82,9 +82,12 @@ build-ftgl: $(MAKE) -C $(FTGL) CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" \ CFLAGS="$(CFLAGS)" lib -${target}: build-simavr build-libc3 build-ftgl ${board} +${target}: obj_dir build-simavr build-libc3 build-ftgl ${board} @echo $@ done +obj_dir: + mkdir -p ${OBJ} + clean: clean-${OBJ} rm -rf *.a *.axf ${target} *.vcd $(MAKE) -C $(LIBC3) CC="$(CC)" CFLAGS="$(CFLAGS)" clean From 84c8be7885af5c222aaccfc34a90cf4bc6413a32 Mon Sep 17 00:00:00 2001 From: Mike Iannacone Date: Tue, 20 Jul 2021 10:40:01 -0400 Subject: [PATCH 2/2] change from freetype-config (obsolete) to pkg-config --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 91f1d09..9d46b43 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,8 @@ VPATH += ${SIMAVR_R}/examples/parts VPATH += ${SIMAVR_R}/examples/shared # requires libfreetype6-dev -FTC = ${shell PATH="$(PATH):/usr/X11/bin" which freetype-config} +#FTC = ${shell PATH="$(PATH):/usr/X11/bin" which freetype-config} +FTC = pkg-config freetype2 # for the Open Motion Controller board CPPFLAGS := -DMOTHERBOARD=91 @@ -80,7 +81,7 @@ build-libc3: $(MAKE) -C $(LIBC3) CC="$(CC)" CFLAGS="$(CFLAGS)" build-ftgl: $(MAKE) -C $(FTGL) CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" \ - CFLAGS="$(CFLAGS)" lib + CFLAGS="$(CFLAGS)" freetype-gl ${target}: obj_dir build-simavr build-libc3 build-ftgl ${board} @echo $@ done