From d25296d03fdaeaadd002cd37171ef2b20695cf26 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 14 Feb 2019 00:37:48 +0100 Subject: Makefile tweaks --- Makefile | 2 +- test.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ddc4dca..14a7242 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ genversion: @echo "#pragma once" >> version.h @echo "#define VERSION $(VERSION)" >> version.h @echo "#define PATCHLEVEL $(PATCHLEVEL)" >> version.h - @echo "#define BRANCH \"`git status -bs | grep '##'`\"" >> version.h + @echo "#define VERSTRING \"`git describe`\"" >> version.h @echo "#define DATE \"`date +'%d.%m.20%y'`\"" >> version.h @echo "#define TIME \"`date +'%H:%M:%S'`\"" >> version.h diff --git a/test.cpp b/test.cpp index 4278f2a..313b632 100644 --- a/test.cpp +++ b/test.cpp @@ -57,12 +57,8 @@ int main(int argc, char* argv[]) render.render(); - ver.drawPoint('v', {0,0}, true, _COL_WHITE); - ver.drawPoint(VERSION + 48, {1,0}, true, _COL_WHITE); - ver.drawPoint('.', {2,0}, true, _COL_WHITE); - ver.drawPoint(PATCHLEVEL + 48, {3,0}, true, _COL_WHITE); - ver.drawText(DATE, {32,0}, _COL_WHITE); - ver.drawText(BRANCH, {5,0}, _COL_WHITE); + ver.drawText(DATE, {20,0}, _COL_WHITE); + ver.drawText(VERSTRING, {0,0}, _COL_WHITE); int iver = handler.createObject(&ver); handler.moveObject(iver, {0,0}, _MOVE_ABSOLUTE); -- cgit v1.2.3