Merge remote branch 'origin/master'

[dragonfireclient.git] / src / config.h

diff --git a/src/config.h b/src/config.h
index 54b89a060902ab1ac03a826330d85576d7a35334..37dc6e0ef345ebce35ab91d1223b2889f3742f5b 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -6,30 +6,37 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#define PROJECT_NAME "Minetest"
+#define VERSION_STRING "unknown"
+#define RUN_IN_PLACE 0
+#define USE_GETTEXT 0
+#define USE_SOUND 0
+#define USE_CURL 0
+#define USE_FREETYPE 0
+#define STATIC_SHAREDIR ""
+#define BUILD_INFO "non-cmake"
+
 #ifdef USE_CMAKE_CONFIG_H
        #include "cmake_config.h"
-#else
-       #define PROJECT_NAME "minetest"
-
-       //#define INSTALL_PREFIX ""
-       #define VERSION_STRING "unknown"
-       #ifdef NDEBUG
-               #define BUILD_TYPE "Release"
-       #else
-               #define BUILD_TYPE "Debug"
-       #endif
-       #ifdef RUN_IN_PLACE
-               #define RUN_IN_PLACE_BOOLSTRING "1"
-       #else
-               #define RUN_IN_PLACE_BOOLSTRING "0"
-       #endif
-       #if USE_GETTEXT
-               #define USE_GETTEXT_BOOLSTRING "1"
-       #else
-               #define USE_GETTEXT_BOOLSTRING "0"
-       #endif
-
-       #define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" USE_GETTEXT="USE_GETTEXT_BOOLSTRING" BUILD_TYPE="BUILD_TYPE
+       #undef PROJECT_NAME
+       #define PROJECT_NAME CMAKE_PROJECT_NAME
+       #undef VERSION_STRING
+       #define VERSION_STRING CMAKE_VERSION_STRING
+       #undef RUN_IN_PLACE
+       #define RUN_IN_PLACE CMAKE_RUN_IN_PLACE
+       #undef USE_GETTEXT
+       #define USE_GETTEXT CMAKE_USE_GETTEXT
+       #undef USE_SOUND
+       #define USE_SOUND CMAKE_USE_SOUND
+       #undef USE_CURL
+       #define USE_CURL CMAKE_USE_CURL
+       #undef USE_FREETYPE
+       #define USE_FREETYPE CMAKE_USE_FREETYPE
+       #undef STATIC_SHAREDIR
+       #define STATIC_SHAREDIR CMAKE_STATIC_SHAREDIR
+       #undef BUILD_INFO
+       #define BUILD_INFO CMAKE_BUILD_INFO
 #endif
+
 #endif