Rename OFFICIAL_BUILD to OFFICIAL_COLOBOT_BUILD
In order to avoid conflict with OFFICIAL_BUILD variable inside ntverp.h. It caused compilation error "invalid integer expression" https://github.com/tpn/winsdk-10/blob/master/Include/10.0.10240.0/shared/ntverp.h#L1341008-fix
parent
d90592f7b6
commit
f93fd61c26
|
@ -204,7 +204,7 @@ option(DEV_BUILD "Enable development build (enables some debugging tools, local
|
|||
|
||||
# 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)
|
||||
option(OFFICIAL_COLOBOT_BUILD "Official build (changes crash screen text)" OFF)
|
||||
|
||||
# Portable build - load all data from current directory
|
||||
option(PORTABLE "Portable build" OFF)
|
||||
|
|
|
@ -133,7 +133,7 @@ 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 << "==============================" << std::endl;
|
||||
#if BUILD_NUMBER == 0
|
||||
#ifdef OFFICIAL_BUILD
|
||||
#ifdef OFFICIAL_COLOBOT_BUILD
|
||||
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"
|
||||
|
|
|
@ -4,4 +4,4 @@
|
|||
#define COLOBOT_VERSION_DISPLAY "@COLOBOT_VERSION_DISPLAY@"
|
||||
|
||||
#define BUILD_NUMBER @BUILD_NUMBER@
|
||||
#cmakedefine OFFICIAL_BUILD
|
||||
#cmakedefine OFFICIAL_COLOBOT_BUILD
|
||||
|
|
Loading…
Reference in New Issue