From d22621efc10859ae68f51fdcb83da422668dfc91 Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 6 Apr 2014 10:48:04 +0200 Subject: [PATCH] Make config honor build system specified config defines --- src/config.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/config.h b/src/config.h index 55bbb5be..1558ebe0 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"