Fix double free caused by CGUITTFont code

[dragonfireclient.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 039100914499464da3cb7a80294eafdc443f17d9..5e116464213765b6546e7be4e691f1066ae077e8 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -11,12 +11,12 @@
 
 #if defined USE_CMAKE_CONFIG_H
        #include "cmake_config.h"
-#elif defined (__ANDROID__) || defined (ANDROID)
+#elif defined (__ANDROID__)
        #define PROJECT_NAME "minetest"
        #define PROJECT_NAME_C "Minetest"
        #define STATIC_SHAREDIR ""
-       #include "android_version.h"
-       #ifdef NDEBUG
+       #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) STR(VERSION_EXTRA)
+#ifdef NDEBUG
                #define BUILD_TYPE "Release"
        #else
                #define BUILD_TYPE "Debug"
@@ -28,13 +28,3 @@
                #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);