rename autogenerated version file, it clashes during merges

This commit is contained in:
milek7
2020-10-19 02:38:53 +02:00
parent 2881747eb0
commit b4951a5db4
5 changed files with 5 additions and 6 deletions

View File

@@ -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 ) {