From 156baf013607cf50ecb4592ba4f34c2a958dc211 Mon Sep 17 00:00:00 2001 From: MrBesen Date: Sun, 20 Sep 2020 13:20:34 +0200 Subject: [PATCH] init --- .gitignore | 17 ++++++++ .gitmodules | 3 ++ .vscode/c_cpp_properties.json | 18 +++++++++ .vscode/launch.json | 50 +++++++++++++++++++++++ .vscode/tasks.json | 45 +++++++++++++++++++++ Log | 1 + Makefile | 75 +++++++++++++++++++++++++++++++++++ init.sh | 12 ++++++ src/main.cpp | 16 ++++++++ tests/main.cpp | 26 ++++++++++++ tests/test.h | 11 +++++ 11 files changed, 274 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 100644 .vscode/c_cpp_properties.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json create mode 160000 Log create mode 100644 Makefile create mode 100755 init.sh create mode 100644 src/main.cpp create mode 100644 tests/main.cpp create mode 100644 tests/test.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..adee4ed --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +*.bin +*.out +build/ +*.exe +.gdb_history + +*.so +*.bmp +*.d + +test +.vscode/settings.json + +%NAME% +%NAME%_strip + + diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..b83001f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Log"] + path = Log + url = https://git.mrbesen.de/mrbesen/Log.git diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..6633d00 --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "${workspaceFolder}/src/", + "${workspaceFolder}/Log/", + "${workspaceFolder}/src/**" + ], + "defines": [], + "compilerPath": "/usr/bin/g++", + "cStandard": "c11", + "cppStandard": "c++17", + "intelliSenseMode": "gcc-x64" + } + ], + "version": 4 +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..dfa23f8 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,50 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "test Debuggen (gdb)", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/test", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Automatische Strukturierung und Einrückung für \"gdb\" aktivieren", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ], + "preLaunchTask": "make test", + "miDebuggerPath": "/usr/bin/gdb" + }, + { + "name": "Debuggen (gdb)", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/%NAME%", + "args": ["-s"], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Automatische Strukturierung und Einrückung für \"gdb\" aktivieren", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ], + "preLaunchTask": "make all", + "miDebuggerPath": "/usr/bin/gdb" + } + ] +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..5d1e4cd --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,45 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "make all", + "type": "shell", + "command": "make -j all", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [ + "$gcc" + ] + }, + { + "label": "make clean", + "type": "shell", + "command": "make clean", + "problemMatcher": [] + }, + { + "label": "leak check", + "type": "shell", + "command": "/usr/bin/valgrind --leak-check=full ${workspaceFolder}/%NAME% -s", + "problemMatcher": [], + "dependsOn": "make all" + }, + { + "label": "leak check ALL", + "type": "shell", + "command": "/usr/bin/valgrind --leak-check=full --show-leak-kinds=all ${workspaceFolder}/%NAME% -s", + "problemMatcher": [], + "dependsOn": "make all" + }, + { + "label": "make test", + "type": "shell", + "command": "make -j test", + "problemMatcher": ["$gcc"], + } + ] +} diff --git a/Log b/Log new file mode 160000 index 0000000..7ad3056 --- /dev/null +++ b/Log @@ -0,0 +1 @@ +Subproject commit 7ad305641a674b0aa39a4bfc08794bbbca389f87 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8e6adf3 --- /dev/null +++ b/Makefile @@ -0,0 +1,75 @@ +# Author Yannis Gerlach +# Hochschule Osnabrück +# 29.04.2020 + +# `make clean all` nicht mit -j verwenden! -> race condition im make file +# statdessen: `make clean; make all -j` verwenden + +NAME = %NAME% +NAMETEST = test +CFLAGS = -std=c++17 -O2 -g -pipe -Wall -Wextra -Wno-unused-parameter -Wpedantic -rdynamic -msse2 -mavx2 #-march=native -Wall +CXX = g++ +SRCF = src/ +BUILDDIR = build/ +TESTF = tests/ +DEPF = $(BUILDDIR)deps/ + +LOGF = ./Log/ +LOGO = $(LOGF)Log.o + +INCLUDES = -I$(LOGF) -Iminiaudio/ +LDFLAGS = -lGL -lglfw -lfreeimage -lGLEW -lassimp -lpthread -lm -ldl + +SRCFILES = $(shell find $(SRCF) -name "*.cpp") +OBJFILES = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(patsubst %.cpp, %.o, $(SRCFILES))) $(LOGO) +DEPFILES = $(wildcard $(DEPF)*.d) + +SOURCEDIRS = $(shell find $(SRCF) -type d -printf "%p/\n") +BUILDDIRS = $(patsubst $(SRCF)%, $(BUILDDIR)%, $(SOURCEDIRS)) + +OBJFILESTEST = $(filter-out $(BUILDDIR)main.o, $(OBJFILES)) + +INCLUDES += $(addprefix -I, $(SOURCEDIRS)) + +all: $(NAME) runtest + +$(NAME): $(BUILDDIRS) $(DEPF) $(OBJFILES) + @echo "Linking $@" + @$(CXX) $(CFLAGS) -o $@ $(filter %.o, $^) $(LDFLAGS) + +$(BUILDDIR)%.o: $(SRCF)%.cpp + @echo "Compiling: $@" + @$(CXX) $(CFLAGS) $(INCLUDES) $< -MM -MT $@ > $(DEPF)$(subst /,_,$*).d + @$(CXX) -c -o $@ $(CFLAGS) $(INCLUDES) $< + +$(NAME)_strip: $(NAME) + @echo "Strip $<" + @strip -o $@ $< + +%/: + mkdir -p $@ + +clean-depends: + $(RM) -r $(DEPF) + +$(LOGO): + $(MAKE) -C $(LOGF) all + +clean: + $(RM) -r $(NAME) $(BUILDDIR) $(NAMETEST) $(NAME)_strip shader/debug/ + $(MAKE) -C $(LOGF) $@ + +$(NAMETEST): $(BUILDDIRS) $(DEPF) $(TESTF)*.cpp $(OBJFILESTEST) + @echo "Compiling tests" + @$(CXX) -o $@ $(filter %.o, $^) $(filter %.cpp, $^) $(CFLAGS) -I$(SRCF) $(INCLUDES) $(LDFLAGS) + +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/init.sh b/init.sh new file mode 100755 index 0000000..a349514 --- /dev/null +++ b/init.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# init all files in this repo and then delete this one + +if [ "$#" -ne "1" ]; then + echo "usage: $0 " + exit 1 +fi + +find . -type f -exec sed -i "s#%NAME%#${1}#g" {} + + +rm -i "$0" + diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..e066350 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,16 @@ + +#include "Log.h" + +int main(int argc, const char** argv) { + Log::init(); + Log::setConsoleLogLevel(Log::Level::TRACE); + Log::addLogfile("log.txt", Log::Level::TRACE); +#if __unix__ + Log::setColoredOutput(true); +#endif + + Log::info("Hello, World!"); + + Log::stop(); + return 0; +} diff --git a/tests/main.cpp b/tests/main.cpp new file mode 100644 index 0000000..f55c453 --- /dev/null +++ b/tests/main.cpp @@ -0,0 +1,26 @@ +#include +#include "test.h" + +//tests + +test_t tests[] = {NULL}; + +int main(int argc, char** argv) { + + test_t* current = tests; + int failcount = 0; + int testcount = 0; + for(; *current; current++) { + testcount++; + printf("\033[1mRunning test number: %d ", testcount); + if((*current)()) { + printf("\033[1;92msucceeded\033[0;1m!\n"); + } else { + printf("\033[1;91mfailed\033[0;1m\n"); + failcount++; + } + } + + printf("\033[1;93m%d\033[0;1m/%d failed\n", failcount, testcount); + return failcount > 0; +} diff --git a/tests/test.h b/tests/test.h new file mode 100644 index 0000000..890d25b --- /dev/null +++ b/tests/test.h @@ -0,0 +1,11 @@ +#define TESTFAILED 0 +#define TESTGOOD 1 + +#include + +#define TESTDATA "./tests/data/" + +#define ASSERT(BED, ERR) if(!(BED)) { std::cout << __FILE__ << ":" << __LINE__ << " " << ERR << std::endl; return TESTFAILED; } +// #define ASSERT(BED) ASSERT(BED, "") + +typedef int (*test_t)();