jthread remove locks that aren't absolutely required

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 85ce03b7993668a222310c6667e0635e21b2b6fc..6836ad6eb19992092ab7f41c9205689cecd7f184 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -220,15 +220,17 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
        if(CMAKE_CROSSCOMPILING)
                message(WARNING "Cross-compiling enabled, assuming LuaJIT is not broken")
                set(VALID_LUAJIT_VERSION 1)
-       elseif(CMAKE_CROSSCOMPILING)
+       else(CMAKE_CROSSCOMPILING)
                set(BACKUP_REQUIRED_INCS CMAKE_REQUIRED_INCLUDES)
                set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} ${LUA_INCLUDE_DIR}")
                CHECK_C_SOURCE_RUNS("
                        #include <luajit.h>
                        #include <stdio.h>
                        #include <string.h>
-               
-                       static char** broken_luajit_versions = (char *[]) {
+
+                       #define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+                       static char *broken_luajit_versions[] = {
                                        \"LuaJIT 2.0.0-beta7\",
                                        \"LuaJIT 2.0.0-beta6\",
                                        \"LuaJIT 2.0.0-beta5\",
@@ -237,10 +239,11 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
                                        \"LuaJIT 2.0.0-beta2\",
                                        \"LuaJIT 2.0.0-beta1\"
                        };
-                       int main(int argc,char** argv) {
-                               unsigned int i = 0;
-                               for (i=0; i < sizeof(broken_luajit_versions); i++) {
-                                       if (strcmp(LUAJIT_VERSION,broken_luajit_versions[i]) == 0) {
+
+                       int main(int argc, char *argv[]) {
+                               unsigned int i;
+                               for (i = 0; i < ARRAYSIZE(broken_luajit_versions); i++) {
+                                       if (strcmp(LUAJIT_VERSION, broken_luajit_versions[i]) == 0) {
                                                return 1;
                                        }
                                }
@@ -288,6 +291,25 @@ if(ENABLE_LEVELDB)
        endif(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR)
 endif(ENABLE_LEVELDB)
 
+set(USE_REDIS 0)
+
+OPTION(ENABLE_REDIS "Enable redis backend" 1)
+
+if(ENABLE_REDIS)
+       find_library(REDIS_LIBRARY hiredis)
+       find_path(REDIS_INCLUDE_DIR hiredis.h PATH_SUFFIXES hiredis)
+       message(STATUS "redis library: ${REDIS_LIBRARY}")
+       message(STATUS "redis headers: ${REDIS_INCLUDE_DIR}")
+       if(REDIS_LIBRARY AND REDIS_INCLUDE_DIR)
+               set(USE_REDIS 1)
+               message(STATUS "redis backend enabled")
+               include_directories(${REDIS_INCLUDE_DIR})
+       else(REDIS_LIBRARY AND REDIS_INCLUDE_DIR)
+               set(USE_REDIS 0)
+               message(STATUS "redis not found!")
+       endif(REDIS_LIBRARY AND REDIS_INCLUDE_DIR)
+endif(ENABLE_REDIS)
+
 configure_file(
        "${PROJECT_SOURCE_DIR}/cmake_config.h.in"
        "${PROJECT_BINARY_DIR}/cmake_config.h"
@@ -365,6 +387,7 @@ set(common_SRCS
        database-dummy.cpp
        database-leveldb.cpp
        database-sqlite3.cpp
+       database-redis.cpp
        player.cpp
        test.cpp
        sha1.cpp
@@ -382,7 +405,7 @@ set(common_SRCS
        ${UTIL_SRCS}
 )
 
-# This gives us the icon
+# This gives us the icon and file version information
 if(WIN32)
        set(WINRESOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc)
        if(MINGW)
@@ -390,10 +413,11 @@ if(WIN32)
                        set(CMAKE_RC_COMPILER "windres.exe")
                endif()
                ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
-                       COMMAND ${CMAKE_RC_COMPILER} -I${CMAKE_CURRENT_SOURCE_DIR}
+                       COMMAND ${CMAKE_RC_COMPILER} -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_BINARY_DIR}
                        -i${WINRESOURCE_FILE}
                        -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
-                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                       DEPENDS ${WINRESOURCE_FILE})
                SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
        else(MINGW) # Probably MSVC
                set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE})
@@ -420,11 +444,9 @@ set(minetest_SRCS
        chat.cpp
        hud.cpp
        guiKeyChangeMenu.cpp
-       guiMessageMenu.cpp
        guiTextInputMenu.cpp
        guiFormSpecMenu.cpp
        guiTable.cpp
-       guiPauseMenu.cpp
        guiPasswordChange.cpp
        guiVolumeChange.cpp
        guiDeathScreen.cpp
@@ -531,6 +553,9 @@ if(BUILD_CLIENT)
        if (USE_LEVELDB)
                target_link_libraries(${PROJECT_NAME} ${LEVELDB_LIBRARY})
        endif(USE_LEVELDB)
+       if (USE_REDIS)
+               target_link_libraries(${PROJECT_NAME} ${REDIS_LIBRARY})
+       endif(USE_REDIS)
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
@@ -548,6 +573,9 @@ if(BUILD_SERVER)
        if (USE_LEVELDB)
                target_link_libraries(${PROJECT_NAME}server ${LEVELDB_LIBRARY})
        endif(USE_LEVELDB)
+       if (USE_REDIS)
+               target_link_libraries(${PROJECT_NAME}server ${REDIS_LIBRARY})
+       endif(USE_REDIS)
        if(USE_CURL)
                target_link_libraries(
                        ${PROJECT_NAME}server