updated Makefile, main.cpp, .gitgnore and log module

This commit is contained in:
mrbesen 2020-11-13 17:17:37 +01:00
parent e6547ccd41
commit 039cc4348d
Signed by: MrBesen
GPG Key ID: 596B2350DCD67504
6 changed files with 12 additions and 14 deletions

3
.gitignore vendored
View File

@ -13,5 +13,4 @@ test
%NAME%
%NAME%_strip
log.txt

6
.gitmodules vendored
View File

@ -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

1
Log

@ -1 +0,0 @@
Subproject commit 7ad305641a674b0aa39a4bfc08794bbbca389f87

View File

@ -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)

View File

@ -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;

1
thirdparty/Log vendored Submodule

@ -0,0 +1 @@
Subproject commit 87d63150abd021da95db52fea5b72f61847cbfd6