Add limit parameter to decompressZlib

[dragonfireclient.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index ac7684e204410693369642cc811607bf7aebc071..039100914499464da3cb7a80294eafdc443f17d9 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -3,27 +3,25 @@
        Otherwise use default values
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #define STRINGIFY(x) #x
 #define STR(x) STRINGIFY(x)
 
 
-#ifdef USE_CMAKE_CONFIG_H
+#if defined USE_CMAKE_CONFIG_H
        #include "cmake_config.h"
-#else
-       #define PROJECT_NAME "Minetest"
-       #define RUN_IN_PLACE 0
-       #define USE_CURL 0
-       #define USE_FREETYPE 0
-       #define USE_GETTEXT 0
-       #define USE_LEVELDB 0
-       #define USE_LUAJIT 0
-       #define USE_REDIS 0
-       #define USE_SOUND 0
-       #define HAVE_ENDIAN_H 0
+#elif defined (__ANDROID__) || defined (ANDROID)
+       #define PROJECT_NAME "minetest"
+       #define PROJECT_NAME_C "Minetest"
        #define STATIC_SHAREDIR ""
+       #include "android_version.h"
+       #ifdef NDEBUG
+               #define BUILD_TYPE "Release"
+       #else
+               #define BUILD_TYPE "Debug"
+       #endif
+#else
        #ifdef NDEBUG
                #define BUILD_TYPE "Release"
        #else
@@ -31,18 +29,12 @@
        #endif
 #endif
 
-#ifdef __ANDROID__
-       #include "android_version.h"
-#endif
-
-#define BUILD_INFO "BUILD_TYPE=" BUILD_TYPE \
-               " RUN_IN_PLACE=" STR(RUN_IN_PLACE) \
-               " USE_GETTEXT=" STR(USE_GETTEXT) \
-               " USE_SOUND=" STR(USE_SOUND) \
-               " USE_CURL=" STR(USE_CURL) \
-               " USE_FREETYPE=" STR(USE_FREETYPE) \
-               " USE_LUAJIT=" STR(USE_LUAJIT) \
-               " STATIC_SHAREDIR=" STR(STATIC_SHAREDIR)
-
-#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);