project(minetest)
cmake_minimum_required( VERSION 2.6 )
+INCLUDE(CheckCSourceRuns)
+
# Set some random things default to not being visible in the GUI
mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY)
set(CGUITTFONT_LIBRARY cguittfont)
endif(USE_FREETYPE)
-
-find_library(LUA_LIBRARY luajit
- NAMES luajit-5.1)
-find_path(LUA_INCLUDE_DIR luajit.h
- NAMES luajit.h
- PATH_SUFFIXES luajit-2.0)
-message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
-message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
+if (NOT DISABLE_LUAJIT)
+ find_library(LUA_LIBRARY luajit
+ NAMES luajit-5.1)
+ find_path(LUA_INCLUDE_DIR luajit.h
+ NAMES luajit.h
+ PATH_SUFFIXES luajit-2.0)
+ message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
+ message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
+else (NOT ${DISABLE_LUAJIT} MATCHES "1")
+ message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)")
+ set(LUA_LIBRARY "")
+ set(LUA_INCLUDE_DIR "")
+endif (NOT DISABLE_LUAJIT)
set(USE_LUAJIT 0)
if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
- message (STATUS "LuaJIT found.")
- set(USE_LUAJIT 1)
-else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
+ message (STATUS "LuaJIT found, checking for broken versions...")
+ if(CMAKE_CROSSCOMPILING)
+ message(WARNING "Cross-compiling enabled, assuming LuaJIT is not broken")
+ set(VALID_LUAJIT_VERSION 1)
+ 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>
+
+ #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\",
+ \"LuaJIT 2.0.0-beta4\",
+ \"LuaJIT 2.0.0-beta3\",
+ \"LuaJIT 2.0.0-beta2\",
+ \"LuaJIT 2.0.0-beta1\"
+ };
+
+ 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;
+ }
+ }
+ return 0;
+ }
+ "
+ VALID_LUAJIT_VERSION)
+ set(CMAKE_REQUIRED_INCLUDES BACKUP_REQUIRED_INCS)
+ endif(CMAKE_CROSSCOMPILING)
+ if (VALID_LUAJIT_VERSION)
+ message (STATUS "LuaJIT version ok")
+ set(USE_LUAJIT 1)
+ else (VALID_LUAJIT_VERSION)
+ message (STATUS "LuaJIT versions till 2.0.0beta7 known to be broken, update to at least beta8")
+ set(USE_LUAJIT 0)
+ endif (VALID_LUAJIT_VERSION)
+endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
+
+if(NOT USE_LUAJIT)
message (STATUS "LuaJIT not found, using bundled Lua.")
set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
set(LUA_LIBRARY "lua")
add_subdirectory(lua)
-endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
+endif(NOT USE_LUAJIT)
mark_as_advanced(LUA_LIBRARY)
mark_as_advanced(LUA_INCLUDE_DIR)
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"
connection.cpp
environment.cpp
server.cpp
+ clientiface.cpp
socket.cpp
mapblock.cpp
mapsector.cpp
database-dummy.cpp
database-leveldb.cpp
database-sqlite3.cpp
+ database-redis.cpp
player.cpp
test.cpp
sha1.cpp
${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)
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})
chat.cpp
hud.cpp
guiKeyChangeMenu.cpp
- guiMessageMenu.cpp
- guiTextInputMenu.cpp
guiFormSpecMenu.cpp
- guiPauseMenu.cpp
+ guiTable.cpp
guiPasswordChange.cpp
guiVolumeChange.cpp
- guiDeathScreen.cpp
guiChatConsole.cpp
client.cpp
clientmedia.cpp
guiEngine.cpp
guiFileSelectMenu.cpp
convert_json.cpp
+ drawscene.cpp
${minetest_SCRIPT_SRCS}
)
-
-if(USE_FREETYPE)
- set(minetest_SRCS
- ${minetest_SRCS}
- intlGUIEditBox.cpp
- )
-endif(USE_FREETYPE)
-
list(SORT minetest_SRCS)
# Server sources
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)
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
if(VORBISFILE_DLL)
install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR})
endif()
- if(CURL_DLL)
- install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
- endif()
+ endif()
+ if(CURL_DLL)
+ install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
endif()
endif()
projects / oweals / minetest.git / blobdiff