aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-07-23 15:47:09 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-07-24 09:18:29 +0200
commit4ffba76bb39363a01647acb19667cd33bbbd700b (patch)
tree762b06908d9168b27bd639112a3546981c9050c4
parentf4a08f7fb3c9a249ad1256e2cf1a2e2ca3f2a709 (diff)
downloadminetest-4ffba76bb39363a01647acb19667cd33bbbd700b.tar.gz
minetest-4ffba76bb39363a01647acb19667cd33bbbd700b.tar.bz2
minetest-4ffba76bb39363a01647acb19667cd33bbbd700b.zip
Place project name and gettext use in config
-rw-r--r--src/cmake_config.h.in3
-rw-r--r--src/config.h9
2 files changed, 10 insertions, 2 deletions
diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in
index 5e375191f..6a8f93bac 100644
--- a/src/cmake_config.h.in
+++ b/src/cmake_config.h.in
@@ -3,6 +3,7 @@
#ifndef CMAKE_CONFIG_H
#define CMAKE_CONFIG_H
+#define PROJECT_NAME "@PROJECT_NAME@"
#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
#define VERSION_STRING "@VERSION_STRING@"
#ifdef NDEBUG
@@ -10,7 +11,7 @@
#else
#define BUILD_TYPE "Debug"
#endif
-#define BUILD_INFO "VER="VERSION_STRING" RUN_IN_PLACE=@RUN_IN_PLACE@ INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@ BUILD_TYPE="BUILD_TYPE
+#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
#endif
diff --git a/src/config.h b/src/config.h
index b24cf6a69..eb1d1a9aa 100644
--- a/src/config.h
+++ b/src/config.h
@@ -9,6 +9,8 @@
#ifdef USE_CMAKE_CONFIG_H
#include "cmake_config.h"
#else
+ #define PROJECT_NAME "minetest"
+
//#define INSTALL_PREFIX ""
#define VERSION_STRING "unknown"
#ifdef NDEBUG
@@ -21,7 +23,12 @@
#else
#define RUN_IN_PLACE_BOOLSTRING "0"
#endif
- #define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" BUILD_TYPE="BUILD_TYPE
+ #ifdef USE_GETTEXT
+ #define USE_GETTEXT_BOOLSTRING "ON"
+ #else
+ #define USE_GETTEXT_BOOLSTRING "OFF"
+ #endif
+ #define BUILD_INFO "NON-CMAKE RUN_IN_PLACE="RUN_IN_PLACE_BOOLSTRING" USE_GETTEXT="USE_GETTEXT_BOOLSTRING" BUILD_TYPE="BUILD_TYPE
#endif
#endif