endif(APPLE)
endif(BUILD_CLIENT)
find_package(ZLIB REQUIRED)
- set(PLATFORM_LIBS -lpthread -lrt ${CMAKE_DL_LIBS})
+ set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
+ if(APPLE)
+ set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
+ else()
+ set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+ endif(APPLE)
#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
# This way Xxf86vm is found on OpenBSD too
find_library(XXF86VM_LIBRARY Xxf86vm)
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\",
\"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;
}
}
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"
mapgen.cpp
mapgen_v6.cpp
mapgen_v7.cpp
- mapgen_indev.cpp
mapgen_singlenode.cpp
- mapgen_math.cpp
treegen.cpp
dungeongen.cpp
cavegen.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
guiTable.cpp
- guiPauseMenu.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(BUILD_CLIENT)
add_executable(${PROJECT_NAME} ${minetest_SRCS})
add_dependencies(${PROJECT_NAME} GenerateVersion)
- target_link_libraries(
+ set(minetest_LIBS
${PROJECT_NAME}
${ZLIB_LIBRARIES}
${IRRLICHT_LIBRARY}
${PLATFORM_LIBS}
${CLIENT_PLATFORM_LIBS}
)
+ if(APPLE)
+ target_link_libraries(
+ ${minetest_LIBS}
+ ${ICONV_LIBRARY}
+ )
+ else()
+ target_link_libraries(
+ ${minetest_LIBS}
+ )
+ endif()
if(USE_CURL)
target_link_libraries(
${PROJECT_NAME}
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
else()
# Probably GCC
-
+ if(APPLE)
+ SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
+ endif()
if(WARN_ALL)
set(RELEASE_WARNING_FLAGS "-Wall")
else()
set(OTHER_FLAGS "-mthreads -fexceptions")
endif()
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -ffast-math -Wall -pipe -funroll-loops")
if(APPLE)
- set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
- set(ARCH i386)
- endif()
-
- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
+ else()
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer")
+ endif(APPLE)
set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
if(USE_GPROF)
if(CURL_DLL)
install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
endif()
+ if (ZLIB_DLL)
+ install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
+ endif()
+ if(FREETYPE_DLL)
+ install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
+ endif()
endif()
if(BUILD_CLIENT)