Refactor the_game() to make it more understandable and maintainable.

[minetest.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 1558ebe09777072b7dc66dffbf473515a406063f..f1aef03aa56756adc871792b4a1ddebfdad10082 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -8,7 +8,10 @@
 
 #define PROJECT_NAME "Minetest"
 #define RUN_IN_PLACE 0
+#define STATIC_SHAREDIR ""
+
 #define USE_GETTEXT 0
+
 #ifndef USE_SOUND
        #define USE_SOUND 0
 #endif
@@ -17,8 +20,9 @@
        #define USE_CURL 0
 #endif
 
-#define USE_FREETYPE 0
-#define STATIC_SHAREDIR ""
+#ifndef USE_FREETYPE
+       #define USE_FREETYPE 0
+#endif
 
 #ifndef USE_LEVELDB
        #define USE_LEVELDB 0
@@ -28,6 +32,10 @@
        #define USE_LUAJIT 0
 #endif
 
+#ifndef USE_REDIS
+       #define USE_REDIS 0
+#endif
+
 #ifdef USE_CMAKE_CONFIG_H
        #include "cmake_config.h"
        #undef PROJECT_NAME
@@ -48,6 +56,8 @@
        #define USE_LEVELDB CMAKE_USE_LEVELDB
        #undef USE_LUAJIT
        #define USE_LUAJIT CMAKE_USE_LUAJIT
+       #undef USE_REDIS
+       #define USE_REDIS CMAKE_USE_REDIS
        #undef VERSION_MAJOR
        #define VERSION_MAJOR CMAKE_VERSION_MAJOR
        #undef VERSION_MINOR
@@ -64,5 +74,10 @@
        #define VERSION_EXTRA_STRING CMAKE_VERSION_EXTRA_STRING
 #endif
 
+#ifdef __ANDROID__
+       #include "android_version.h"
+       #define VERSION_STRING CMAKE_VERSION_STRING
+#endif
+
 #endif