Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:53:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #384 from stqism/master

Browse Source 
Adds full -D support to toxics versioning, includes the commit number
This commit is contained in:
irungentoo 2013-08-08 06:34:42 -07:00
commit 7bcff9eb99
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 2.6.0) cmake_minimum_required(VERSION 2.6.0)
project(toxic C) project(toxic C)
execute_process(COMMAND git rev-list HEAD --count OUTPUT_VARIABLE COMMIT)
SET(GCC_COVERAGE_COMPILE_FLAGS '-DTOXICVER="0.1.1_r${COMMIT}"')
add_definitions(${GCC_COVERAGE_COMPILE_FLAGS})
set(exe_name toxic) set(exe_name toxic)
add_executable(${exe_name} add_executable(${exe_name}

2
main.c
View File

@ -22,7 +22,7 @@ extern int add_req(uint8_t *public_key); // XXX
/* Holds status of chat windows */ /* Holds status of chat windows */
char WINDOW_STATUS[MAX_WINDOW_SLOTS]; char WINDOW_STATUS[MAX_WINDOW_SLOTS];
#define TOXICVER "0.1.0" //Will be moved to a -D flag later //#define TOXICVER "0.1.0" //Will be moved to a -D flag later
static ToxWindow windows[MAX_WINDOW_SLOTS]; static ToxWindow windows[MAX_WINDOW_SLOTS];
static ToxWindow* prompt; static ToxWindow* prompt;