diff --git a/.gitignore b/.gitignore index 8e1c685e..f2d2b9af 100644 --- a/.gitignore +++ b/.gitignore @@ -73,4 +73,4 @@ ipch/ builds/ CMakeLists.txt.user -version.h +version_info.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d300e3a2..37a60046 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,7 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) -configure_file("${CMAKE_SOURCE_DIR}/version.h.in" "${CMAKE_SOURCE_DIR}/version.h") +configure_file("${CMAKE_SOURCE_DIR}/version_info.h.in" "${CMAKE_SOURCE_DIR}/version_info.h") set (PREFIX "") diff --git a/Globals.h b/Globals.h index b11d0b85..f2f9997e 100644 --- a/Globals.h +++ b/Globals.h @@ -16,7 +16,6 @@ http://mozilla.org/MPL/2.0/. #include "light.h" #include "utilities.h" #include "motiontelemetry.h" -#include "version.h" #ifdef WITH_UART #include "uart.h" #endif @@ -204,7 +203,7 @@ struct global_settings { int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji // other std::string AppName{ "EU07" }; - std::string asVersion{ VERSION_INFO }; // z opisem + std::string asVersion; // z opisem motiontelemetry::conf_t motiontelemetry_conf; std::string screenshot_dir; bool loading_log = true; diff --git a/application.cpp b/application.cpp index 947f66aa..a1fad067 100644 --- a/application.cpp +++ b/application.cpp @@ -28,6 +28,7 @@ http://mozilla.org/MPL/2.0/. #include "Train.h" #include "Timer.h" #include "dictionary.h" +#include "version_info.h" #pragma comment (lib, "dsound.lib") #pragma comment (lib, "winmm.lib") @@ -654,6 +655,7 @@ eu07_application::init_files() { int eu07_application::init_settings( int Argc, char *Argv[] ) { + Global.asVersion = VERSION_INFO; Global.LoadIniFile( "eu07.ini" ); #ifdef _WIN32 @@ -663,8 +665,6 @@ eu07_application::init_settings( int Argc, char *Argv[] ) { } #endif - Global.asVersion = VERSION_INFO; - // process command line arguments for( int i = 1; i < Argc; ++i ) { diff --git a/version.h.in b/version_info.h.in similarity index 100% rename from version.h.in rename to version_info.h.in