eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 19:49:19 +02:00
Code Issues 123 Wiki Activity

rename autogenerated version file, it clashes during merges

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -73,4 +73,4 @@ ipch/
builds/ builds/
CMakeLists.txt.user CMakeLists.txt.user
version.h version_info.h

2
CMakeLists.txt
View File

@@ -258,7 +258,7 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE 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 "") set (PREFIX "")

3
Globals.h
View File

@@ -16,7 +16,6 @@ http://mozilla.org/MPL/2.0/.
#include "light.h" #include "light.h"
#include "utilities.h" #include "utilities.h"
#include "motiontelemetry.h" #include "motiontelemetry.h"
#include "version.h"
#ifdef WITH_UART #ifdef WITH_UART
#include "uart.h" #include "uart.h"
#endif #endif
@@ -204,7 +203,7 @@ struct global_settings {
int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji
// other // other
std::string AppName{ "EU07" }; std::string AppName{ "EU07" };
std::string asVersion{ VERSION_INFO }; // z opisem std::string asVersion; // z opisem
motiontelemetry::conf_t motiontelemetry_conf; motiontelemetry::conf_t motiontelemetry_conf;
std::string screenshot_dir; std::string screenshot_dir;
bool loading_log = true; bool loading_log = true;

4
application.cpp
View File

@@ -28,6 +28,7 @@ http://mozilla.org/MPL/2.0/.
#include "Train.h" #include "Train.h"
#include "Timer.h" #include "Timer.h"
#include "dictionary.h" #include "dictionary.h"
#include "version_info.h"
#pragma comment (lib, "dsound.lib") #pragma comment (lib, "dsound.lib")
#pragma comment (lib, "winmm.lib") #pragma comment (lib, "winmm.lib")
@@ -654,6 +655,7 @@ eu07_application::init_files() {
int int
eu07_application::init_settings( int Argc, char *Argv[] ) { eu07_application::init_settings( int Argc, char *Argv[] ) {
Global.asVersion = VERSION_INFO;
Global.LoadIniFile( "eu07.ini" ); Global.LoadIniFile( "eu07.ini" );
#ifdef _WIN32 #ifdef _WIN32
@@ -663,8 +665,6 @@ eu07_application::init_settings( int Argc, char *Argv[] ) {
} }
#endif #endif
Global.asVersion = VERSION_INFO;
// process command line arguments // process command line arguments
for( int i = 1; i < Argc; ++i ) { for( int i = 1; i < Argc; ++i ) {

0
version.h.in → version_info.h.in
View File