mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-03-22 15:05:03 +01:00
rename autogenerated version file, it clashes during merges
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -73,4 +73,4 @@ ipch/
|
||||
builds/
|
||||
|
||||
CMakeLists.txt.user
|
||||
version.h
|
||||
version_info.h
|
||||
|
||||
@@ -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 "")
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 ) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user