From 23ce3e83dfc2702da044ccdd65712c1a7c1c5a05 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 15 Oct 2013 23:48:06 +0000 Subject: [PATCH] changed: if EZC_USE_WINIX_LOGGER macro is defined then we add -I../../winix flag for compiling git-svn-id: svn://ttmath.org/publicrep/ezc/trunk@442 e52654a7-88a9-db11-a3e9-0013d4bc506e --- src/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index ab7edf7..2844ea5 100755 --- a/src/Makefile +++ b/src/Makefile @@ -7,12 +7,20 @@ all: $(libname) $(libname): $(o) ar rcs $(libname) $(o) +additionalinclude = + +ifdef EZC_USE_WINIX_LOGGER +additionalinclude = -I../../winix +endif + %.o: %.cpp - $(CXX) -c $(CXXFLAGS) $< + $(CXX) -c $(CXXFLAGS) -I../../pikotools $(additionalinclude) $< depend: + # we do not use $(additionalinclude) here because the dependencies would be added to the repository + # and messes other projects makedepend -Y. -I../../pikotools -f- *.cpp > Makefile.dep echo -n "o = " > Makefile.o.dep ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep