aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2014-04-06 10:48:04 +0200
committersapier <Sapier at GMX dot net>2014-04-09 20:47:21 +0200
commitd22621efc10859ae68f51fdcb83da422668dfc91 (patch)
treee7b2f8dd02ed2bf15f81d6dd00eb9c13c83c8416
parenta88c685f0237b0cb0ed8c5d074a214d52d0924a3 (diff)
downloadminetest-d22621efc10859ae68f51fdcb83da422668dfc91.tar.gz
minetest-d22621efc10859ae68f51fdcb83da422668dfc91.tar.bz2
minetest-d22621efc10859ae68f51fdcb83da422668dfc91.zip
Make config honor build system specified config defines
-rw-r--r--src/config.h20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/config.h b/src/config.h
index 55bbb5bee..1558ebe09 100644
--- a/src/config.h
+++ b/src/config.h
@@ -9,12 +9,24 @@
#define PROJECT_NAME "Minetest"
#define RUN_IN_PLACE 0
#define USE_GETTEXT 0
-#define USE_SOUND 0
-#define USE_CURL 0
+#ifndef USE_SOUND
+ #define USE_SOUND 0
+#endif
+
+#ifndef USE_CURL
+ #define USE_CURL 0
+#endif
+
#define USE_FREETYPE 0
#define STATIC_SHAREDIR ""
-#define USE_LEVELDB 0
-#define USE_LUAJIT 0
+
+#ifndef USE_LEVELDB
+ #define USE_LEVELDB 0
+#endif
+
+#ifndef USE_LUAJIT
+ #define USE_LUAJIT 0
+#endif
#ifdef USE_CMAKE_CONFIG_H
#include "cmake_config.h"