diff --git a/.gitignore b/.gitignore index adee4ed..fcc4aa5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,4 @@ test %NAME% %NAME%_strip - - +log.txt diff --git a/.gitmodules b/.gitmodules index b83001f..5fd23c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "Log"] - path = Log - url = https://git.mrbesen.de/mrbesen/Log.git +[submodule "thirdparty/Log"] + path = thirdparty/Log + url = https://git.okaestne.de/okaestne/Log.git diff --git a/Log b/Log deleted file mode 160000 index 7ad3056..0000000 --- a/Log +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ad305641a674b0aa39a4bfc08794bbbca389f87 diff --git a/Makefile b/Makefile index c50c193..4dca735 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Author Yannis Gerlach # Hochschule Osnabrück -# 29.04.2020 +# 13.11.2020 # `make clean all` nicht mit -j verwenden! -> race condition im make file # statdessen: `make clean; make all -j` verwenden @@ -13,12 +13,14 @@ SRCF = src/ BUILDDIR = build/ TESTF = tests/ DEPF = $(BUILDDIR)deps/ +INCF = ./inc/ +INCFS = $(shell find $(INCF) -type d) -LOGF = ./Log/ +LOGF = ./thirdparty/Log/ LOGO = $(LOGF)Log.o -INCLUDES = -I$(LOGF) -Iminiaudio -LDFLAGS = +INCLUDES = -I$(LOGF) $(addprefix -I, $(INCFS)) +LDFLAGS = SRCFILES = $(shell find $(SRCF) -name "*.cpp") OBJFILES = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(patsubst %.cpp, %.o, $(SRCFILES))) $(LOGO) @@ -67,9 +69,6 @@ runtest: $(NAMETEST) @echo "Running tests" ./$< -# fix assets : -# find assets/ -name '*.*' -exec sh -c 'a=$(echo "$0" | sed -r "s/([^.]*)\$/\L\1/"); [ "$a" != "$0" ] && mv "$0" "$a" ' {} \; - .PHONY: clean all $(NAMETEST) clean-depends runtest include $(DEPFILES) diff --git a/src/main.cpp b/src/main.cpp index e066350..627aeca 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -9,7 +9,7 @@ int main(int argc, const char** argv) { Log::setColoredOutput(true); #endif - Log::info("Hello, World!"); + Log::info << "Hello, World!"; Log::stop(); return 0; diff --git a/thirdparty/Log b/thirdparty/Log new file mode 160000 index 0000000..87d6315 --- /dev/null +++ b/thirdparty/Log @@ -0,0 +1 @@ +Subproject commit 87d63150abd021da95db52fea5b72f61847cbfd6