1
0
mirror of https://github.com/MatMoul/g810-led.git synced 2024-12-23 01:06:11 +00:00

Unify version string

Specified version string in makefile will now propogate to VERSION as a
macro appended to CFLAGS.

Cleaned up version string, quotes not necessary when specifying
major/minor/micro, though this is purely cosmetic.

Signed-off-by: Kevin Pearson <pearosn.kevin.m@gmail.com>
This commit is contained in:
Kevin Pearson 2017-04-26 10:07:00 -04:00
parent ca1ecadf98
commit 47e2468681
3 changed files with 9 additions and 6 deletions

View File

@ -16,10 +16,11 @@ includedir?=$(prefix)/include
# Program & versioning information
PROGN=g810-led
MAJOR="0"
MINOR="2"
MICRO="0"
MAJOR=0
MINOR=2
MICRO=0
CFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h
LIBSRCS=src/classes/*.cpp src/classes/*.h

View File

@ -8,13 +8,11 @@ using namespace std;
namespace help {
string version = "0.2.0";
void usage(char *arg0) {
string cmdName = utils::getCmdName(arg0);
cout<<cmdName<<endl;
cout<<"--------"<<endl;
cout<<"Version : "<<version<<endl;
cout<<"Version : "<<VERSION<<endl;
cout<<endl;
cout<<" -a {color}\t\t\t\tSet all keys color"<<endl;
cout<<" -g {keygroup} {color}\t\t\tSet key group color"<<endl;

View File

@ -12,4 +12,8 @@ namespace help {
}
#ifndef VERSION
#define VERSION "unspecified"
#endif
#endif