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:
@@ -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