diff options
author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/version.cpp | |
parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz |
Merge branch 'master' into master
Diffstat (limited to 'src/version.cpp')
-rw-r--r-- | src/version.cpp | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/version.cpp b/src/version.cpp index 0c36c0677..241228a6a 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -21,33 +21,25 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "config.h" #if USE_CMAKE_CONFIG_H -#include "cmake_config_githash.h" + #include "cmake_config_githash.h" #endif #ifndef VERSION_GITHASH -#define VERSION_GITHASH VERSION_STRING + #define VERSION_GITHASH VERSION_STRING #endif const char *g_version_string = VERSION_STRING; const char *g_version_hash = VERSION_GITHASH; const char *g_build_info = - "BUILD_TYPE=" BUILD_TYPE "\n" - "RUN_IN_PLACE=" STR( - RUN_IN_PLACE) "\n" - "USE_GETTEXT=" STR(USE_GETTEXT) "\n" - "USE_" - "SOUND" - "=" STR(USE_SOUND) "\n" - "USE_CURL=" STR(USE_CURL) "\n" - "USE_FREETYPE=" STR( - USE_FREETYPE) "\n" - "USE_LUAJIT=" STR( - USE_LUAJIT) "\n" - "STATIC_SHAREDIR=" STR( - STATIC_SHAREDIR) + "BUILD_TYPE=" BUILD_TYPE "\n" + "RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n" + "USE_GETTEXT=" STR(USE_GETTEXT) "\n" + "USE_SOUND=" STR(USE_SOUND) "\n" + "USE_CURL=" STR(USE_CURL) "\n" + "USE_FREETYPE=" STR(USE_FREETYPE) "\n" + "USE_LUAJIT=" STR(USE_LUAJIT) "\n" + "STATIC_SHAREDIR=" STR(STATIC_SHAREDIR) #if USE_GETTEXT && defined(STATIC_LOCALEDIR) - "\n" - "STATIC_LOCALEDIR=" STR( - STATIC_LOCALEDIR) + "\n" "STATIC_LOCALEDIR=" STR(STATIC_LOCALEDIR) #endif - ; +; |