summaryrefslogtreecommitdiff
path: root/src/version.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2014-04-21 14:10:59 +0200
committersapier <Sapier at GMX dot net>2014-06-29 18:17:56 +0200
commit1cc40c0a7c260f0562572bc99f39a666a12f1b09 (patch)
treec5af6b9787f4c69faa634e82f6484ca4540a7f88 /src/version.cpp
parentff36071d93266c1dd18708f8924d80aa1af5b33e (diff)
downloadminetest-1cc40c0a7c260f0562572bc99f39a666a12f1b09.tar.gz
minetest-1cc40c0a7c260f0562572bc99f39a666a12f1b09.tar.bz2
minetest-1cc40c0a7c260f0562572bc99f39a666a12f1b09.zip
Add support for Android 2.3+
There have been plenty of ppl involved in creating this version. I don't wanna mention names as I'm sure I'd forget someone so I just tell where help has been done: - The partial android versions done by various ppl - Testing on different android devices - reviewing code (especially the in core changes) - testing controls - reviewing texts A big thank you to everyone helping this to be completed!
Diffstat (limited to 'src/version.cpp')
-rw-r--r--src/version.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/version.cpp b/src/version.cpp
index e5de8a61e..83b0a4c40 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -20,19 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "version.h"
#include "config.h"
-#ifdef USE_CMAKE_CONFIG_H
-
-#include "cmake_config_githash.h"
-
const char *minetest_version_simple = CMAKE_VERSION_STRING;
const char *minetest_version_hash = CMAKE_VERSION_GITHASH;
+
+#ifdef USE_CMAKE_CONFIG_H
const char *minetest_build_info =
"VER=" CMAKE_VERSION_GITHASH " " CMAKE_BUILD_INFO;
-
+#elif defined(ANDROID)
+const char *minetest_build_info = "android jni";
#else
-
-const char *minetest_version_simple = "unknown";
-const char *minetest_version_hash = "unknown";
const char *minetest_build_info = "non-cmake";
#endif