updated Makefile, main.cpp, .gitgnore and log module
This commit is contained in:
parent
e6547ccd41
commit
039cc4348d
|
@ -13,5 +13,4 @@ test
|
||||||
|
|
||||||
%NAME%
|
%NAME%
|
||||||
%NAME%_strip
|
%NAME%_strip
|
||||||
|
log.txt
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
[submodule "Log"]
|
[submodule "thirdparty/Log"]
|
||||||
path = Log
|
path = thirdparty/Log
|
||||||
url = https://git.mrbesen.de/mrbesen/Log.git
|
url = https://git.okaestne.de/okaestne/Log.git
|
||||||
|
|
1
Log
1
Log
|
@ -1 +0,0 @@
|
||||||
Subproject commit 7ad305641a674b0aa39a4bfc08794bbbca389f87
|
|
11
Makefile
11
Makefile
|
@ -1,6 +1,6 @@
|
||||||
# Author Yannis Gerlach
|
# Author Yannis Gerlach
|
||||||
# Hochschule Osnabrück
|
# Hochschule Osnabrück
|
||||||
# 29.04.2020
|
# 13.11.2020
|
||||||
|
|
||||||
# `make clean all` nicht mit -j verwenden! -> race condition im make file
|
# `make clean all` nicht mit -j verwenden! -> race condition im make file
|
||||||
# statdessen: `make clean; make all -j` verwenden
|
# statdessen: `make clean; make all -j` verwenden
|
||||||
|
@ -13,11 +13,13 @@ SRCF = src/
|
||||||
BUILDDIR = build/
|
BUILDDIR = build/
|
||||||
TESTF = tests/
|
TESTF = tests/
|
||||||
DEPF = $(BUILDDIR)deps/
|
DEPF = $(BUILDDIR)deps/
|
||||||
|
INCF = ./inc/
|
||||||
|
INCFS = $(shell find $(INCF) -type d)
|
||||||
|
|
||||||
LOGF = ./Log/
|
LOGF = ./thirdparty/Log/
|
||||||
LOGO = $(LOGF)Log.o
|
LOGO = $(LOGF)Log.o
|
||||||
|
|
||||||
INCLUDES = -I$(LOGF) -Iminiaudio
|
INCLUDES = -I$(LOGF) $(addprefix -I, $(INCFS))
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
|
|
||||||
SRCFILES = $(shell find $(SRCF) -name "*.cpp")
|
SRCFILES = $(shell find $(SRCF) -name "*.cpp")
|
||||||
|
@ -67,9 +69,6 @@ runtest: $(NAMETEST)
|
||||||
@echo "Running tests"
|
@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
|
.PHONY: clean all $(NAMETEST) clean-depends runtest
|
||||||
|
|
||||||
include $(DEPFILES)
|
include $(DEPFILES)
|
||||||
|
|
|
@ -9,7 +9,7 @@ int main(int argc, const char** argv) {
|
||||||
Log::setColoredOutput(true);
|
Log::setColoredOutput(true);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Log::info("Hello, World!");
|
Log::info << "Hello, World!";
|
||||||
|
|
||||||
Log::stop();
|
Log::stop();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 87d63150abd021da95db52fea5b72f61847cbfd6
|
Loading…
Reference in New Issue