|
From: Lasse Kärkkäi. <tr...@us...> - 2009-07-26 04:58:39
|
Module: performous
Branch: master
Commit: 19bfb6c75d3cf927bad75b5091875bbdedbf460e
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Jul 26 07:57:39 2009 +0300
Bumped the version number to 0.4-pre1 and made the program always print version number on startup (to ease debugging of pasted problems).
---
CMakeLists.txt | 2 +-
game/main.cc | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6214ffc..717f85b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
project(Performous CXX)
cmake_minimum_required(VERSION 2.6)
-set(PROJECT_VERSION "0.3.2+")
+set(PROJECT_VERSION "0.4-pre1")
# Avoid source tree pollution
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
diff --git a/game/main.cc b/game/main.cc
index 2efcaaa..0708e47 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -192,6 +192,7 @@ template <typename Container> void confOverride(Container const& c, std::string
}
int main(int argc, char** argv) {
+ std::cout << PACKAGE " " VERSION << std::endl;
std::signal(SIGINT, quit);
std::signal(SIGTERM, quit);
std::ios::sync_with_stdio(false); // We do not use C stdio
@@ -243,7 +244,7 @@ int main(int argc, char** argv) {
}
po::notify(vm);
if (vm.count("version")) {
- std::cout << PACKAGE << ' ' << VERSION << std::endl;
+ // Already printed the version string in the beginning...
return 0;
}
if (vm.count("help")) {
|