Update/fix/improve config.h and cmake_config.h.in

diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index 7cbb11f6b2feadd9c7686ecaf567ce301bad4e61..2205e14a2e00abe77f36ea2a4571f2f5a340cbfe 100644 (file)
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -3,16 +3,17 @@
 #ifndef CMAKE_CONFIG_H
 #define CMAKE_CONFIG_H
 
-#define PROJECT_NAME "@PROJECT_NAME@"
-#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
-#define VERSION_STRING "@VERSION_STRING@"
-#define USE_GETTEXT @USE_GETTEXT@
+#define CMAKE_PROJECT_NAME "@PROJECT_NAME@"
+#define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#define CMAKE_VERSION_STRING "@VERSION_STRING@"
 #ifdef NDEBUG
-       #define BUILD_TYPE "Release"
+       #define CMAKE_BUILD_TYPE "Release"
 #else
-       #define BUILD_TYPE "Debug"
+       #define CMAKE_BUILD_TYPE "Debug"
 #endif
-#define BUILD_INFO "VER="VERSION_STRING" RUN_IN_PLACE=@RUN_IN_PLACE@ USE_GETTEXT=@USE_GETTEXT@ INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@ BUILD_TYPE="BUILD_TYPE
+#define CMAKE_USE_GETTEXT @USE_GETTEXT@
+#define CMAKE_USE_AUDIO @USE_AUDIO@
+#define CMAKE_BUILD_INFO "VER=@VERSION_STRING@ BUILD_TYPE="CMAKE_BUILD_TYPE" RUN_IN_PLACE=@RUN_IN_PLACE@ USE_GETTEXT=@USE_GETTEXT@ USE_AUDIO=@USE_AUDIO@ INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@"
 
 #endif
 

diff --git a/src/config.h b/src/config.h
index 54b89a060902ab1ac03a826330d85576d7a35334..a4a1d351ab884e17ee6d7f952f606f2bbf685ba2 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -6,30 +6,28 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#define PROJECT_NAME "Minetest"
+#define VERSION_STRING "unknown"
+#define BUILD_TYPE "unknown"
+#define USE_GETTEXT 0
+#define USE_AUDIO 0
+#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 BUILD_INFO
+       #define BUILD_INFO CMAKE_BUILD_INFO
+       #undef USE_GETTEXT
+       #define USE_GETTEXT CMAKE_USE_GETTEXT
+       #undef USE_AUDIO
+       #define USE_AUDIO CMAKE_USE_AUDIO
+       #undef BUILD_INFO
+       #define BUILD_INFO CMAKE_BUILD_INFO
 #endif
+
 #endif