Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

let's do some tests without time stamp, #83

This commit is contained in:
filux 2015-11-15 10:23:17 +01:00
parent 2b06670b10
commit 3ef7a6c1bc
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/CMakeLists.txt
View File

@ -216,13 +216,11 @@ IF(BUILD_MEGAGLEST)
ENDFOREACH(DIR)
# Force the version and date/time stamp file to be touched so the compile stamp is always right
IF(UNIX)
add_custom_command(
OUTPUT mg.tmp
COMMAND touch ${PROJECT_SOURCE_DIR}/source/glest_game/facilities/game_util.cpp)
add_custom_target(run ALL
DEPENDS mg.tmp)
ENDIF()
# IF(UNIX)
# add_custom_command(OUTPUT mg.tmp
# COMMAND touch ${PROJECT_SOURCE_DIR}/source/glest_game/facilities/game_util.cpp)
# add_custom_target(run ALL DEPENDS mg.tmp)
# ENDIF()
IF(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-subsystem,console -mconsole")

11
source/glest_game/facilities/game_util.cpp
View File

@ -31,7 +31,7 @@ const char *mailString = " http://bugs.megaglest.org";
// !! Use minor versions !! Only major and minor version control compatibility!
// typical version numbers look like this: v3.11-beta1.0 v3.12-dev v3.12.0
// don't forget to update mk/linux/mg-version.sh
// don't forget to update source/version.txt
const string glestVersionString = "v3.12-dev";
const string lastCompatibleSaveGameVersionString = "v3.9.0";
@ -198,9 +198,9 @@ string getNetworkVersionGITString() {
string getCompileDateTime() {
static string result = "";
if(result == "") {
result = string(__DATE__) + " " + string(__TIME__);
}
// if(result == "") {
// result = string(__DATE__) + " " + string(__TIME__);
// }
return result;
}
@ -209,9 +209,10 @@ string getNetworkPlatformFreeVersionString() {
}
string getAboutString1(int i) {
//case 1: return "Built: " + string(__DATE__) + " " + GIT_Rev;
switch(i) {
case 0: return "MegaGlest " + glestVersionString + " (" + "Shared Library " + sharedLibVersionString + ")";
case 1: return "Built: " + string(__DATE__) + " " + GIT_Rev;
case 1: return GIT_Rev;
case 2: return "Copyright 2001-2010 The Glest Team";
case 3: return "Copyright 2010-2015 The MegaGlest Team";
}

3
source/glest_game/main/main.cpp
View File

@ -4174,7 +4174,8 @@ int glestMain(int argc, char** argv) {
if( haveSpecialOutputCommandLineOption == false ||
hasCommandArgument(argc, argv,GAME_ARGS[GAME_ARG_VERSION]) == true) {
printf("%s %s",extractFileFromDirectoryPath(argv[0]).c_str(),getNetworkPlatformFreeVersionString().c_str());
printf("\nCompiled using: %s on: %s platform: %s endianness: %s",getCompilerNameString().c_str(),getCompileDateTime().c_str(),getPlatformNameString().c_str(),(::Shared::PlatformByteOrder::isBigEndian() == true ? "big" : "little"));
// printf("\nCompiled using: %s on: %s platform: %s endianness: %s",getCompilerNameString().c_str(),getCompileDateTime().c_str(),getPlatformNameString().c_str(),(::Shared::PlatformByteOrder::isBigEndian() == true ? "big" : "little"));
printf("\nCompiled using: %s platform: %s endianness: %s",getCompilerNameString().c_str(),getPlatformNameString().c_str(),(::Shared::PlatformByteOrder::isBigEndian() == true ? "big" : "little"));
// printf("\n\nData type sizes int8 = " MG_SIZE_T_SPECIFIER " int16 = " MG_SIZE_T_SPECIFIER " int32 = " MG_SIZE_T_SPECIFIER " int64 = " MG_SIZE_T_SPECIFIER "\n\n",sizeof(int8),sizeof(int16),sizeof(int32),sizeof(int64));
//

6
source/glest_game/menu/menu_state_root.cpp
View File

@ -58,7 +58,8 @@ MenuStateRoot::MenuStateRoot(Program *program, MainMenu *mainMenu):
}
else {
labelVersion.init(buttonXPosition, yPos);
labelVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]");
//labelVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]");
labelVersion.setText(glestVersionString + " [" + getGITRevisionString() + "]");
}
yPos-=55;
@ -174,7 +175,8 @@ void MenuStateRoot::reloadUI() {
labelVersion.setText(glestVersionString);
}
else {
labelVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]");
//labelVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]");
labelVersion.setText(glestVersionString + " [" + getGITRevisionString() + "]");
}
buttonNewGame.setText(lang.getString("NewGame"));