forked from Mirrorlandia_minetest/minetest
Move #includes from version.h to version.cpp
This commit is contained in:
parent
15f3713e2f
commit
587167e940
@ -2196,8 +2196,8 @@ void Client::sendReady()
|
||||
writeU8(os,VERSION_PATCH_ORIG);
|
||||
writeU8(os,0);
|
||||
|
||||
writeU16(os,strlen(CMAKE_VERSION_GITHASH));
|
||||
os.write(CMAKE_VERSION_GITHASH,strlen(CMAKE_VERSION_GITHASH));
|
||||
writeU16(os,strlen(minetest_version_hash));
|
||||
os.write(minetest_version_hash,strlen(minetest_version_hash));
|
||||
|
||||
// Make data buffer
|
||||
std::string s = os.str();
|
||||
|
@ -20,16 +20,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
#include "version.h"
|
||||
#include "config.h"
|
||||
|
||||
const char *minetest_version_simple = CMAKE_VERSION_STRING;
|
||||
const char *minetest_version_hash = CMAKE_VERSION_GITHASH;
|
||||
#ifdef __ANDROID__
|
||||
#include "android_version.h"
|
||||
#elif defined(USE_CMAKE_CONFIG_H)
|
||||
#include "cmake_config_githash.h"
|
||||
#endif
|
||||
|
||||
#ifdef CMAKE_VERSION_GITHASH
|
||||
#define VERSION_GITHASH CMAKE_VERSION_GITHASH
|
||||
#else
|
||||
#define VERSION_GITHASH VERSION_STRING
|
||||
#endif
|
||||
|
||||
const char *minetest_version_simple = VERSION_STRING;
|
||||
const char *minetest_version_hash = VERSION_GITHASH;
|
||||
|
||||
#ifdef USE_CMAKE_CONFIG_H
|
||||
const char *minetest_build_info =
|
||||
"VER=" CMAKE_VERSION_GITHASH " " CMAKE_BUILD_INFO;
|
||||
"VER=" VERSION_GITHASH " " CMAKE_BUILD_INFO;
|
||||
#elif defined(ANDROID)
|
||||
const char *minetest_build_info = "android jni";
|
||||
#else
|
||||
const char *minetest_build_info = "non-cmake";
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -20,13 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
#ifndef VERSION_HEADER
|
||||
#define VERSION_HEADER
|
||||
|
||||
#include "config.h"
|
||||
#ifdef __ANDROID__
|
||||
#include "android_version.h"
|
||||
#else
|
||||
#include "cmake_config_githash.h"
|
||||
#endif
|
||||
|
||||
extern const char *minetest_version_simple;
|
||||
extern const char *minetest_version_hash;
|
||||
extern const char *minetest_build_info;
|
||||
|
Loading…
Reference in New Issue
Block a user