diff --git a/CMake/DefineOptions.cmake b/CMake/DefineOptions.cmake index a97cc898f4..37e856b7c3 100644 --- a/CMake/DefineOptions.cmake +++ b/CMake/DefineOptions.cmake @@ -3,9 +3,6 @@ # This option allows for networking support with StepMania. option(WITH_NETWORKING "Build with networking support." ON) -# This option allows for additional version information to be built-in. -option(WITH_VERSION_INFO "Build with version information." ON) - # This option quiets warnings that are a part of external projects. option(WITH_EXTERNAL_WARNINGS "Build with warnings for all components, not just StepMania." OFF) diff --git a/Docs/Devdocs/CompileFlags.txt b/Docs/Devdocs/CompileFlags.txt index fdff7df41e..774e57b51f 100644 --- a/Docs/Devdocs/CompileFlags.txt +++ b/Docs/Devdocs/CompileFlags.txt @@ -7,10 +7,6 @@ stepmania: WITHOUT_NETWORKING Disables all networking stuff (e.g. StepMania Online). -------------------------------------------------------------------------------- -HAVE_VERSION_INFO -If this isn't defined, passing in --version will only show the name of the -current StepMania version, no build number or date. -Please define HAVE_VERSION_INFO if you can when building StepMania. ================================================================================ sm-ssc: diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake index 08fe555faf..5a62bba8c0 100644 --- a/StepmaniaCore.cmake +++ b/StepmaniaCore.cmake @@ -173,10 +173,6 @@ if (SM_BUILT_INCOMPLETE_TYPE) set(INCOMPLETE_TYPES_BROKEN 1) endif() -if (WITH_VERSION_INFO) - set(HAVE_VERSION_INFO 1) -endif() - # Dependencies go here. include(ExternalProject) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f27f798c2a..7bd7c0396b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -94,10 +94,6 @@ set_target_properties("${SM_EXE_NAME}" PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "${SM_NAME_RELWITHDEBINFO}" ) -if (WITH_VERSION_INFO) - sm_add_compile_definition("${SM_EXE_NAME}" HAVE_VERSION_INFO) -endif() - if (WITH_PORTABLE_TOMCRYPT) sm_add_compile_definition("${SM_EXE_NAME}" LTC_NO_ASM) elseif (WITH_NO_ROLC_TOMCRYPT OR APPLE) diff --git a/src/CommandLineActions.cpp b/src/CommandLineActions.cpp index 95cd4f53e3..794ea72472 100644 --- a/src/CommandLineActions.cpp +++ b/src/CommandLineActions.cpp @@ -88,10 +88,7 @@ static void Version() { #if defined(WIN32) RString sProductID = ssprintf("%s", (string(PRODUCT_FAMILY) + product_version).c_str() ); - RString sVersion = "(StepMania was built without HAVE_VERSION_INFO)"; - #if defined(HAVE_VERSION_INFO) - sVersion = ssprintf("build %s\nCompile Date: %s @ %s", ::sm_version_git_hash, version_date, version_time); - #endif // HAVE_VERSION_INFO + RString sVersion = ssprintf("build %s\nCompile Date: %s @ %s", ::sm_version_git_hash, version_date, version_time); AllocConsole(); freopen("CONOUT$","wb", stdout); diff --git a/src/NetworkSyncManager.cpp b/src/NetworkSyncManager.cpp index 96cf55ca82..91e1213fd6 100644 --- a/src/NetworkSyncManager.cpp +++ b/src/NetworkSyncManager.cpp @@ -8,9 +8,9 @@ NetworkSyncManager *NSMAN; // Aldo: version_num used by GetCurrentSMVersion() // XXX: That's probably not what you want... --root -#if defined(HAVE_VERSION_INFO) + #include "ver.h" -#endif + #if defined(WITHOUT_NETWORKING) NetworkSyncManager::NetworkSyncManager( LoadingWindow *ld ) { useSMserver=false; isSMOnline = false; } @@ -845,7 +845,7 @@ void NetworkSyncManager::GetListOfLANServers( vector& AllServers // Aldo: Please move this method to a new class, I didn't want to create new files because I don't know how to properly update the files for each platform. // I preferred to misplace code rather than cause unneeded headaches to non-windows users, although it would be nice to have in the wiki which files to // update when adding new files and how (Xcode/stepmania_xcode4.3.xcodeproj has a really crazy structure :/). -#if !defined(HAVE_VERSION_INFO) || defined(CMAKE_POWERED) +#if defined(CMAKE_POWERED) unsigned long NetworkSyncManager::GetCurrentSMBuild( LoadingWindow* ld ) { return 0; } #else unsigned long NetworkSyncManager::GetCurrentSMBuild( LoadingWindow* ld ) diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp index 680e0c3777..384a51c7b8 100644 --- a/src/PrefsManager.cpp +++ b/src/PrefsManager.cpp @@ -11,7 +11,7 @@ #include "RageLog.h" #include "SpecialFiles.h" -#if !defined(WITHOUT_NETWORKING) && defined(HAVE_VERSION_INFO) +#if !defined(WITHOUT_NETWORKING) #include "ver.h" #endif @@ -315,19 +315,15 @@ PrefsManager::PrefsManager() : #if !defined(WITHOUT_NETWORKING) , m_bEnableScoreboard ( "EnableScoreboard", true ) - - #if defined(HAVE_VERSION_INFO) - , - m_bUpdateCheckEnable ( "UpdateCheckEnable", true ) - // TODO - Aldo_MX: Use PREFSMAN->m_iUpdateCheckIntervalSeconds & PREFSMAN->m_iUpdateCheckLastCheckedSecond - //, - //m_iUpdateCheckIntervalSeconds ( "UpdateCheckIntervalSeconds", 86400 ), // 24 hours - //m_iUpdateCheckLastCheckedSecond ( "UpdateCheckLastCheckSecond", 0 ) - - // TODO - Aldo_MX: Write helpers in LuaManager.cpp to treat unsigned int/long like LUA Numbers - //, - //m_uUpdateCheckLastCheckedBuild ( "UpdateCheckLastCheckedBuild", version_num ) - #endif + , + m_bUpdateCheckEnable ( "UpdateCheckEnable", true ) + // TODO - Aldo_MX: Use PREFSMAN->m_iUpdateCheckIntervalSeconds & PREFSMAN->m_iUpdateCheckLastCheckedSecond + //, + //m_iUpdateCheckIntervalSeconds ( "UpdateCheckIntervalSeconds", 86400 ), // 24 hours + //m_iUpdateCheckLastCheckedSecond ( "UpdateCheckLastCheckSecond", 0 ) + // TODO - Aldo_MX: Write helpers in LuaManager.cpp to treat unsigned int/long like LUA Numbers + //, + //m_uUpdateCheckLastCheckedBuild ( "UpdateCheckLastCheckedBuild", version_num ) #endif { diff --git a/src/PrefsManager.h b/src/PrefsManager.h index 7c95a6f264..e12a87b9b9 100644 --- a/src/PrefsManager.h +++ b/src/PrefsManager.h @@ -320,16 +320,15 @@ public: #if !defined(WITHOUT_NETWORKING) Preference m_bEnableScoreboard; //Alows disabling of scoreboard in network play - #if defined(HAVE_VERSION_INFO) - // Check for Updates code - Preference m_bUpdateCheckEnable; - // TODO - Aldo_MX: Use PREFSMAN->m_iUpdateCheckIntervalSeconds & PREFSMAN->m_iUpdateCheckLastCheckedSecond - //Preference m_iUpdateCheckIntervalSeconds; - //Preference m_iUpdateCheckLastCheckedSecond; + // Check for Updates code + Preference m_bUpdateCheckEnable; + // TODO - Aldo_MX: Use PREFSMAN->m_iUpdateCheckIntervalSeconds & PREFSMAN->m_iUpdateCheckLastCheckedSecond + //Preference m_iUpdateCheckIntervalSeconds; + //Preference m_iUpdateCheckLastCheckedSecond; + + // TODO - Aldo_MX: Write helpers in LuaManager.cpp to treat unsigned int/long like LUA Numbers + //Preference m_uUpdateCheckLastCheckedBuild; - // TODO - Aldo_MX: Write helpers in LuaManager.cpp to treat unsigned int/long like LUA Numbers - //Preference m_uUpdateCheckLastCheckedBuild; - #endif #endif void ReadPrefsFromIni( const IniFile &ini, const RString &sSection, bool bIsStatic ); diff --git a/src/StepMania.cpp b/src/StepMania.cpp index aa220bc058..14f3824e2f 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -69,10 +69,7 @@ #include "SpecialFiles.h" #include "Profile.h" #include "ActorUtil.h" - -#ifdef HAVE_VERSION_INFO #include "ver.h" -#endif #if defined(WIN32) #include @@ -923,9 +920,7 @@ static void WriteLogHeader() { LOG->Info("%s%s", PRODUCT_FAMILY, product_version); -#if defined(HAVE_VERSION_INFO) LOG->Info( "Compiled %s @ %s (build %s)", version_date, version_time, ::sm_version_git_hash); -#endif time_t cur_time; time(&cur_time); diff --git a/src/archutils/Unix/CrashHandlerChild.cpp b/src/archutils/Unix/CrashHandlerChild.cpp index 05ef4d6b73..0648751087 100644 --- a/src/archutils/Unix/CrashHandlerChild.cpp +++ b/src/archutils/Unix/CrashHandlerChild.cpp @@ -201,9 +201,7 @@ static void child_process() } fprintf( CrashDump, "%s%s crash report", PRODUCT_FAMILY, product_version ); -#if defined(HAVE_VERSION_INFO) fprintf( CrashDump, " (build %s, %s @ %s)", ::sm_version_git_hash, version_date, version_time ); -#endif fprintf( CrashDump, "\n" ); fprintf( CrashDump, "--------------------------------------\n" ); fprintf( CrashDump, "\n" ); diff --git a/src/config.in.hpp b/src/config.in.hpp index 060f16de62..327336f455 100644 --- a/src/config.in.hpp +++ b/src/config.in.hpp @@ -123,9 +123,6 @@ typedef long ssize_t; /* Defined to 1 if the underlying system uses big endian. */ #cmakedefine ENDIAN_BIG 1 -/* Defined to 1 if version information will be printed out. */ -#cmakedefine HAVE_VERSION_INFO 1 - /* Defined to 1 if compiling with WAV support. */ #cmakedefine HAS_WAV 1