Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move #includes from version.h to version.cpp
  • Loading branch information
kahrl committed Aug 9, 2014
1 parent 15f3713 commit 587167e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/client.cpp
Expand Up @@ -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();
Expand Down
19 changes: 15 additions & 4 deletions src/version.cpp
Expand Up @@ -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

7 changes: 0 additions & 7 deletions src/version.h
Expand Up @@ -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;
Expand Down

0 comments on commit 587167e

Please sign in to comment.