mdiluz/ttrts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #8 by defining the version properly and adding a proper line end

Browse source
This commit is contained in:
mdiluzio 2014-12-20 17:27:25 +00:00
parent 98deae237b
commit 4f595ff92e
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/CMakeLists.txt
View file

@ -4,7 +4,6 @@ cmake_minimum_required( VERSION 2.8.7 )
set( TTRTS_VERSION_MAJOR 0 ) set( TTRTS_VERSION_MAJOR 0 )
set( TTRTS_VERSION_MINOR 0 ) set( TTRTS_VERSION_MINOR 0 )
set( TTRTS_VERSION_PATCH 1 ) set( TTRTS_VERSION_PATCH 1 )
set( TTRTS_VERSION_STRING "${TTRTS_VERSION_MAJOR}.${TTRTS_VERSION_MINOR}.${TTRTS_VERSION_PATCH}")
# Use c++1y (14) # Use c++1y (14)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++1y" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++1y" )
@ -25,7 +24,7 @@ add_definitions(
-DTTRTS_VERSION_MAJOR=${TTRTS_VERSION_MAJOR} -DTTRTS_VERSION_MAJOR=${TTRTS_VERSION_MAJOR}
-DTTRTS_VERSION_MINOR=${TTRTS_VERSION_MINOR} -DTTRTS_VERSION_MINOR=${TTRTS_VERSION_MINOR}
-DTTRTS_VERSION_PATCH=${TTRTS_VERSION_PATCH} -DTTRTS_VERSION_PATCH=${TTRTS_VERSION_PATCH}
-DTTRTS_VERSION_STRING=\"${DTTRTS_VERSION_STRING}\" -DTTRTS_VERSION_STRING=\"${TTRTS_VERSION_MAJOR}.${TTRTS_VERSION_MINOR}.${TTRTS_VERSION_PATCH}\"
) )

2
source/ttrts/main.cpp
View file

@ -46,7 +46,7 @@ bool OutputGameStateFile(CTTRTSGame &game, std::string &gameDir)
// Append the version number // Append the version number
turnDescriptor = std::string("==== ttrts v") turnDescriptor = std::string("==== ttrts v")
+ sk_ttrts_version_string + sk_ttrts_version_string
+ std::string(" ====") + std::string(" ====\n")
+ turnDescriptor; + turnDescriptor;
turnFile<<turnDescriptor; turnFile<<turnDescriptor;