immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added official build info in crash screen

dev-time-step
krzys-h 2015-12-19 22:10:15 +01:00
parent e20f5f6983
commit 2e17712b5d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -176,6 +176,10 @@ option(ASSERTS "Enable assert()s" ON)
# Development build can be enabled/disabled regardless of build type # Development build can be enabled/disabled regardless of build type
option(DEV_BUILD "Enable development build (enables some debugging tools, local setting paths, etc.)" OFF) option(DEV_BUILD "Enable development build (enables some debugging tools, local setting paths, etc.)" OFF)
# Official build - changes text on the crash screen
# PLEASE DO NOT USE ON UNOFFICIAL BUILDS. Thanks.
option(OFFICIAL_BUILD "Official build (changes crash screen text)" OFF)
# Portable build - load all data from current directory # Portable build - load all data from current directory
option(PORTABLE "Portable build" OFF) option(PORTABLE "Portable build" OFF)

8
src/app/signal_handlers.cpp
View File

@ -133,8 +133,12 @@ void CSignalHandlers::ReportError(const std::string& errorMessage)
msg << "including information on what you were doing before this happened and all the information below." << std::endl; msg << "including information on what you were doing before this happened and all the information below." << std::endl;
msg << "==============================" << std::endl; msg << "==============================" << std::endl;
#if BUILD_NUMBER == 0 #if BUILD_NUMBER == 0
// COLOBOT_VERSION_DISPLAY doesn't update if you don't run CMake after "git pull" #ifdef OFFICIAL_BUILD
msg << "You seem to be running a custom compilation of version " << COLOBOT_VERSION_DISPLAY << ", but please verify that." << std::endl; msg << "You are running official " << COLOBOT_VERSION_DISPLAY << " build." << std::endl;
#else
// COLOBOT_VERSION_DISPLAY doesn't update if you don't run CMake after "git pull"
msg << "You seem to be running a custom compilation of version " << COLOBOT_VERSION_DISPLAY << ", but please verify that." << std::endl;
#endif
#else #else
msg << "You are running version " << COLOBOT_VERSION_DISPLAY << " from CI build #" << BUILD_NUMBER << std::endl; msg << "You are running version " << COLOBOT_VERSION_DISPLAY << " from CI build #" << BUILD_NUMBER << std::endl;
#endif #endif

1
src/common/version.h.cmake
View File

@ -4,3 +4,4 @@
#define COLOBOT_VERSION_DISPLAY "@COLOBOT_VERSION_DISPLAY@" #define COLOBOT_VERSION_DISPLAY "@COLOBOT_VERSION_DISPLAY@"
#define BUILD_NUMBER @BUILD_NUMBER@ #define BUILD_NUMBER @BUILD_NUMBER@
#cmakedefine OFFICIAL_BUILD