From c6231c027707d72c72ae1807f2eb6f2d63fa4a8a Mon Sep 17 00:00:00 2001 From: Kai Schoos Date: Sat, 5 Sep 2020 16:09:08 +0200 Subject: [PATCH 1/2] Updated Makefile so the project compiles in Vitis --- ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile b/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile index bfd9c1f5..12fe99f7 100644 --- a/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile +++ b/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile @@ -12,15 +12,17 @@ INCLUDES=-I./. -I${INCLUDEDIR} INCLUDEFILES=*.h LIBSOURCES=*.c OUTS = *.o +OBJECTS = $(addsuffix .o, $(basename $(wildcard *.c))) +ASSEMBLY_OBJECTS = $(addsuffix .o, $(basename $(wildcard *.S))) libs: echo "Compiling PmodOLED..." $(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES) - $(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} + $(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OBJECTS} ${ASSEMBLY_OBJECTS} make clean include: ${CP} $(INCLUDEFILES) $(INCLUDEDIR) clean: - rm -rf ${OUTS} + rm -rf ${OBJECTS} ${ASSEMBLY_OBJECTS} From 55cc0f0243161be1b1595e9549dec7da6ab29b60 Mon Sep 17 00:00:00 2001 From: Kai Schoos Date: Sat, 5 Sep 2020 16:16:19 +0200 Subject: [PATCH 2/2] Update Makefile Small fix --- ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile b/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile index 12fe99f7..eb284263 100644 --- a/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile +++ b/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile @@ -25,4 +25,5 @@ include: ${CP} $(INCLUDEFILES) $(INCLUDEDIR) clean: - rm -rf ${OBJECTS} ${ASSEMBLY_OBJECTS} + rm -rf ${OBJECTS} + rm -rf ${ASSEMBLY_OBJECTS}