Skip to content
Permalink
Browse files

Update version correctly again (#6462)

* Update version correctly again
Partial revert of PR 6331

* It doesn't update automatically
  • Loading branch information...
SmallJoker authored and nerzhul committed Sep 26, 2017
1 parent 50423d8 commit 50b2185ced9dc64e054ce743bbc22d15ecdf6192
Showing with 15 additions and 15 deletions.
  1. +14 −0 src/config.h
  2. +1 −15 src/version.cpp
@@ -5,6 +5,10 @@

#pragma once

#define STRINGIFY(x) #x
#define STR(x) STRINGIFY(x)


#if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID)
@@ -24,3 +28,13 @@
#define BUILD_TYPE "Debug"
#endif
#endif

#define 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);
@@ -31,20 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define VERSION_GITHASH VERSION_STRING
#endif

#define STRINGIFY(x) #x
#define STR(x) STRINGIFY(x)

const char *g_version_string = VERSION_STRING;
const char *g_version_hash = VERSION_GITHASH;
const char *g_build_info =
#ifdef __STDC__
"Build date: " __DATE__ " " __TIME__ "\n"
#endif
"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);
const char *g_build_info = BUILD_INFO;

0 comments on commit 50b2185

Please sign in to comment.
You can’t perform that action at this time.