diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/version.cpp | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/version.cpp')
| -rw-r--r-- | src/version.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/src/version.cpp b/src/version.cpp index 241228a6a..0c36c0677 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -21,25 +21,33 @@ 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 -; + ; |