From a320d4d59636009c2846a194f6e839767d66fdcf Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Sun, 31 Jul 2016 16:12:07 -0500 Subject: [PATCH] Added Git Info for macOS Builds --- OpenRCT2.xcodeproj/project.pbxproj | 22 +++++++++++++++++++++- src/version.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 378d705d58..dbdc96ac9a 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -2014,6 +2014,7 @@ D4EC48E91C264FC20024B507 /* Download Libraries */, D4EC012A1C25532B00DAFE69 /* Setup AppIcon */, D40F4E1D1C2528D5009582C9 /* Create Segment Files */, + D4CA88671D4E962100060C11 /* Get Git Variables */, D497D0741C20FD52002BF46A /* Sources */, D497D0751C20FD52002BF46A /* Frameworks */, D41B74201C210B190080A7B9 /* Embed Frameworks */, @@ -2111,6 +2112,21 @@ shellPath = /bin/sh; shellScript = "\"${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\" sprite build \"${SRCROOT}/data/g2.dat\" \"${SRCROOT}/resources/g2/\""; }; + D4CA88671D4E962100060C11 /* Get Git Variables */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Get Git Variables"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/gitversion.h", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"#define\" OPENRCT2_BRANCH \\\"$(git rev-parse --abbrev-ref HEAD)\\\" > \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1 \\\"$(git rev-parse HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1_SHORT \\\"$(git rev-parse --short HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\""; + }; D4EC012A1C25532B00DAFE69 /* Setup AppIcon */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2517,6 +2533,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", OPENGL_NO_LINK, + "OPENRCT2_BUILD_INFO_HEADER=\"\\\"$(DERIVED_FILE_DIR)/gitversion.h\\\"\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -2559,7 +2576,10 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = OPENGL_NO_LINK; + GCC_PREPROCESSOR_DEFINITIONS = ( + OPENGL_NO_LINK, + "OPENRCT2_BUILD_INFO_HEADER=\"\\\"$(DERIVED_FILE_DIR)/gitversion.h\\\"\"", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; diff --git a/src/version.c b/src/version.c index 67dc2e2e48..29ae37d999 100644 --- a/src/version.c +++ b/src/version.c @@ -14,6 +14,10 @@ *****************************************************************************/ #pragma endregion +#ifdef OPENRCT2_BUILD_INFO_HEADER +#include OPENRCT2_BUILD_INFO_HEADER +#endif + #ifdef OPENRCT2_BUILD_NUMBER const char *gBuildNumber = OPENRCT2_BUILD_NUMBER; #else