From c863340aec7deebaa4f7d343ca63db3552f8ce39 Mon Sep 17 00:00:00 2001 From: marc1uk Date: Mon, 14 Feb 2022 12:29:07 +0000 Subject: [PATCH 1/3] fix missing L in DataModelLib --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8f616dc..368b3b8 100644 --- a/Makefile +++ b/Makefile @@ -72,13 +72,13 @@ UserTools/Factory/Factory.o: UserTools/Factory/Factory.cpp lib/libStore.so inclu @echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m" cp UserTools/Factory/Factory.h include cp UserTools/Unity.h include - -g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelib) + -g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelLib) UserTools/%.o: UserTools/%.cpp lib/libStore.so include/Tool.h lib/libLogging.so lib/libDataModel.so | include/Tool.h @echo -e "\e[38;5;214m\n*************** Making " $@ "****************\e[0m" cp $(shell dirname $<)/*.h include - -g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelib) + -g++ $(CXXFLAGS) -c -o $@ $< -I include -L lib -lStore -lDataModel -lLogging $(MyToolsInclude) $(MyToolsLib) $(DataModelInclude) $(DataModelLib) target: remove $(patsubst %.cpp, %.o, $(wildcard UserTools/$(TOOL)/*.cpp)) From e553347a65978bd171e085522a8f0f6f1dd4b832 Mon Sep 17 00:00:00 2001 From: brichards64 Date: Fri, 24 Feb 2023 22:28:59 +0000 Subject: [PATCH 2/3] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 368b3b8..2f807a7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CXXFLAGS= -fPIC -O3 -Wpedantic -Wall +CXXFLAGS= -fPIC -O3 -Wpedantic -Wall ifeq ($(MAKECMDGOALS),debug) CXXFLAGS+= -O0 -g -lSegFault -rdynamic -DDEBUG From 13a28a153c199211d11661bf955a7c02296730e2 Mon Sep 17 00:00:00 2001 From: brichards64 Date: Fri, 24 Feb 2023 23:07:17 +0000 Subject: [PATCH 3/3] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2f807a7..368b3b8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CXXFLAGS= -fPIC -O3 -Wpedantic -Wall +CXXFLAGS= -fPIC -O3 -Wpedantic -Wall ifeq ($(MAKECMDGOALS),debug) CXXFLAGS+= -O0 -g -lSegFault -rdynamic -DDEBUG