Add SQLite3 libraries to buildbot
[oweals/minetest.git] / src / CMakeLists.txt
index 8cdaa510d891fd01842ffeb7488c45954fa9d24f..858ffe90c5943a003f0a940044e903e3abe55c02 100644 (file)
@@ -1,10 +1,28 @@
 project(minetest)
 cmake_minimum_required( VERSION 2.6 )
 
+INCLUDE(CheckCSourceRuns)
+INCLUDE(CheckIncludeFiles)
+
 # Set some random things default to not being visible in the GUI
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
-mark_as_advanced(JTHREAD_INCLUDE_DIR JTHREAD_LIBRARY)
 mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY)
+mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY)
+
+option(ENABLE_CURL "Enable cURL support for fetching media" 1)
+
+if (NOT ENABLE_CURL)
+       mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
+endif(NOT ENABLE_CURL)
+
+if( ENABLE_CURL )
+       find_package(CURL)
+endif( ENABLE_CURL )
+set(USE_CURL 0)
+if (CURL_FOUND AND ENABLE_CURL)
+       message(STATUS "cURL support enabled")
+       set(USE_CURL 1)
+endif(CURL_FOUND AND ENABLE_CURL)
 
 # user-visible option to enable/disable gettext usage
 OPTION(ENABLE_GETTEXT "Use GetText for internationalization" 0)
@@ -78,6 +96,12 @@ if(USE_SOUND)
                )
 endif()
 
+option(ENABLE_FREETYPE "Enable freetype2 (truetype fonts and basic unicode support)" OFF)
+set(USE_FREETYPE 0)
+if(ENABLE_FREETYPE)
+       set(USE_FREETYPE 1)
+endif(ENABLE_FREETYPE)
+
 if(NOT MSVC)
        set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
 endif()
@@ -102,8 +126,14 @@ if(WIN32)
                        CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
        set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
                        CACHE PATH "irrlicht dir")
-       set(MINGWM10_DLL ""
-                       CACHE FILEPATH "Path to mingwm10.dll (for installation)")
+       if(USE_FREETYPE)
+               set(FREETYPE_INCLUDE_DIR_ft2build "${PROJECT_SOURCE_DIR}/../../freetype2/include/"
+                               CACHE PATH "freetype include dir")
+               set(FREETYPE_INCLUDE_DIR_freetype2 "${PROJECT_SOURCE_DIR}/../../freetype2/include/freetype"
+                               CACHE PATH "freetype include dir")
+               set(FREETYPE_LIBRARY "${PROJECT_SOURCE_DIR}/../../freetype2/objs/win32/vc2005/freetype247.lib"
+                               CACHE FILEPATH "Path to freetype247.lib")
+       endif(USE_FREETYPE)
        if(ENABLE_SOUND)
                set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
                set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
@@ -132,6 +162,11 @@ else()
        endif(BUILD_CLIENT)
        find_package(ZLIB REQUIRED)
        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)
@@ -139,78 +174,250 @@ else()
        set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
 endif()
 
-find_package(Jthread REQUIRED)
 find_package(Sqlite3 REQUIRED)
-
-# Do not use system-wide installation of Lua, because it'll likely be a
-# different version and/or has different build options.
-set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-set(LUA_LIBRARY "lua")
+find_package(Json REQUIRED)
+
+option(ENABLE_GLES "Enable OpenGL ES support" 0)
+mark_as_advanced(ENABLE_GLES)
+if(ENABLE_GLES)
+       find_package(OpenGLES2)
+endif(ENABLE_GLES)
+
+if(USE_FREETYPE)
+       if(UNIX)
+               include(FindPkgConfig)
+               if(PKG_CONFIG_FOUND)
+                       pkg_check_modules(FREETYPE QUIET freetype2)
+                       if(FREETYPE_FOUND)
+                               SET(FREETYPE_PKGCONFIG_FOUND TRUE)
+                               SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
+                               # because cmake is idiotic
+                               string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
+                               string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
+                       endif(FREETYPE_FOUND)
+               endif(PKG_CONFIG_FOUND)
+       endif(UNIX)
+       if(NOT FREETYPE_FOUND)
+               find_package(Freetype REQUIRED)
+       endif(NOT FREETYPE_FOUND)
+       set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont")
+       set(CGUITTFONT_LIBRARY cguittfont)
+endif(USE_FREETYPE)
+
+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, 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(NOT USE_LUAJIT)
+
+mark_as_advanced(LUA_LIBRARY)
+mark_as_advanced(LUA_INCLUDE_DIR)
+
+set(USE_LEVELDB 0)
+
+OPTION(ENABLE_LEVELDB "Enable LevelDB backend")
+
+if(ENABLE_LEVELDB)
+       find_library(LEVELDB_LIBRARY leveldb)
+       find_path(LEVELDB_INCLUDE_DIR db.h PATH_SUFFIXES leveldb)
+       message (STATUS "LevelDB library: ${LEVELDB_LIBRARY}")
+       message (STATUS "LevelDB headers: ${LEVELDB_INCLUDE_DIR}")
+       if(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR)
+               set(USE_LEVELDB 1)
+               message(STATUS "LevelDB backend enabled")
+               include_directories(${LEVELDB_INCLUDE_DIR})
+       else(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR)
+               set(USE_LEVELDB 0)
+               message(STATUS "LevelDB not found!")
+       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)
+
+CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H)
+if(NOT HAVE_ENDIAN_H)
+  set(HAVE_ENDIAN_H 0)
+endif(NOT HAVE_ENDIAN_H)
 
 configure_file(
        "${PROJECT_SOURCE_DIR}/cmake_config.h.in"
        "${PROJECT_BINARY_DIR}/cmake_config.h"
 )
 
+# Add a target that always rebuilds cmake_config_githash.h
+add_custom_target(GenerateVersion
+       COMMAND ${CMAKE_COMMAND}
+       -D "GENERATE_VERSION_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
+       -D "GENERATE_VERSION_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}"
+       -D "VERSION_STRING=${VERSION_STRING}"
+       -D "VERSION_EXTRA=${VERSION_EXTRA}"
+       -P "${CMAKE_SOURCE_DIR}/cmake/Modules/GenerateVersion.cmake"
+       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_subdirectory(jthread)
+add_subdirectory(script)
+add_subdirectory(util)
+
 set(common_SRCS
-       rollback_interface.cpp
-       rollback.cpp
-       genericobject.cpp
-       voxelalgorithms.cpp
-       sound.cpp
-       quicktune.cpp
-       subgame.cpp
-       inventorymanager.cpp
-       mods.cpp
+       ban.cpp
+       base64.cpp
+       cavegen.cpp
+       clientiface.cpp
+       collision.cpp
+       connection.cpp
        content_abm.cpp
+       content_mapnode.cpp
+       content_nodemeta.cpp
+       content_sao.cpp
+       convert_json.cpp
        craftdef.cpp
-       nameidmapping.cpp
+       database-dummy.cpp
+       database-leveldb.cpp
+       database-redis.cpp
+       database-sqlite3.cpp
+       database.cpp
+       debug.cpp
+       defaultsettings.cpp
+       dungeongen.cpp
+       emerge.cpp
+       environment.cpp
+       filesys.cpp
+       genericobject.cpp
+       gettext.cpp
+       httpfetch.cpp
+       inventory.cpp
+       inventorymanager.cpp
        itemdef.cpp
-       nodedef.cpp
-       object_properties.cpp
-       scriptapi.cpp
-       script.cpp
+       light.cpp
        log.cpp
-       content_sao.cpp
+       map.cpp
+       mapblock.cpp
        mapgen.cpp
-       content_nodemeta.cpp
-       content_mapnode.cpp
-       collision.cpp
+       mapgen_singlenode.cpp
+       mapgen_v5.cpp
+       mapgen_v6.cpp
+       mapgen_v7.cpp
+       mapnode.cpp
+       mapsector.cpp
+       mg_biome.cpp
+       mg_decoration.cpp
+       mg_ore.cpp
+       mg_schematic.cpp
+       mods.cpp
+       nameidmapping.cpp
+       nodedef.cpp
        nodemetadata.cpp
        nodetimer.cpp
-       serverobject.cpp
        noise.cpp
+       object_properties.cpp
+       pathfinder.cpp
+       player.cpp
        porting.cpp
-       tool.cpp
-       defaultsettings.cpp
-       mapnode.cpp
-       voxel.cpp
-       inventory.cpp
-       debug.cpp
+       quicktune.cpp
+       rollback.cpp
+       rollback_interface.cpp
        serialization.cpp
-       light.cpp
-       filesys.cpp
-       connection.cpp
-       environment.cpp
        server.cpp
+       serverlist.cpp
+       serverobject.cpp
+       settings.cpp
+       sha1.cpp
        socket.cpp
-       mapblock.cpp
-       mapsector.cpp
-       map.cpp
-       player.cpp
+       sound.cpp
+       staticobject.cpp
+       subgame.cpp
        test.cpp
-       sha1.cpp
-       base64.cpp
-       ban.cpp
-       util/serialize.cpp
-       util/directiontables.cpp
-       util/numeric.cpp
-       util/pointedthing.cpp
-       util/string.cpp
-       util/timetaker.cpp
+       tool.cpp
+       treegen.cpp
+       version.cpp
+       voxel.cpp
+       voxelalgorithms.cpp
+       ${JTHREAD_SRCS}
+       ${common_SCRIPT_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)
@@ -218,10 +425,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})
@@ -232,62 +440,85 @@ endif()
 set(minetest_SRCS
        ${common_SRCS}
        ${sound_SRCS}
-       localplayer.cpp
-       sky.cpp
-       clientmap.cpp
-       content_cso.cpp
-       content_mapblock.cpp
-       content_cao.cpp
-       mesh.cpp
-       mapblock_mesh.cpp
-       farmesh.cpp
-       keycode.cpp
        camera.cpp
-       clouds.cpp
-       clientobject.cpp
        chat.cpp
-       guiMainMenu.cpp
-       guiKeyChangeMenu.cpp
-       guiMessageMenu.cpp
-       guiTextInputMenu.cpp
-       guiFormSpecMenu.cpp
-       guiPauseMenu.cpp
-       guiPasswordChange.cpp
-       guiDeathScreen.cpp
-       guiChatConsole.cpp
-       guiCreateWorld.cpp
-       guiConfirmMenu.cpp
        client.cpp
+       clientmap.cpp
+       clientmedia.cpp
+       clientobject.cpp
+       clouds.cpp
+       content_cao.cpp
+       content_cso.cpp
+       content_mapblock.cpp
+       convert_json.cpp
+       drawscene.cpp
        filecache.cpp
-       tile.cpp
+       fontengine.cpp
        game.cpp
+       guiChatConsole.cpp
+       guiEngine.cpp
+       guiFileSelectMenu.cpp
+       guiFormSpecMenu.cpp
+       guiKeyChangeMenu.cpp
+       guiPasswordChange.cpp
+       guiTable.cpp
+       guiVolumeChange.cpp
+       hud.cpp
+       keycode.cpp
+       localplayer.cpp
        main.cpp
+       mapblock_mesh.cpp
+       mesh.cpp
+       particles.cpp
+       shader.cpp
+       sky.cpp
+       tile.cpp
+       wieldmesh.cpp
+       ${minetest_SCRIPT_SRCS}
 )
+list(SORT minetest_SRCS)
 
 # Server sources
 set(minetestserver_SRCS
        ${common_SRCS}
        main.cpp
 )
+list(SORT minetestserver_SRCS)
 
 include_directories(
        ${PROJECT_BINARY_DIR}
+       ${PROJECT_SOURCE_DIR}
        ${IRRLICHT_INCLUDE_DIR}
        ${ZLIB_INCLUDE_DIR}
        ${CMAKE_BUILD_TYPE}
        ${PNG_INCLUDE_DIR}
        ${GETTEXT_INCLUDE_DIR}
        ${SOUND_INCLUDE_DIRS}
-       ${JTHREAD_INCLUDE_DIR}
        ${SQLITE3_INCLUDE_DIR}
        ${LUA_INCLUDE_DIR}
+       ${JSON_INCLUDE_DIR}
+       ${PROJECT_SOURCE_DIR}/script
 )
 
+if(USE_FREETYPE)
+       include_directories(
+               ${FREETYPE_INCLUDE_DIRS}
+               ${CGUITTFONT_INCLUDE_DIR}
+       )
+endif(USE_FREETYPE)
+
+if(USE_CURL)
+       include_directories(
+               ${CURL_INCLUDE_DIR}
+       )
+endif(USE_CURL)
+
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 if(BUILD_CLIENT)
        add_executable(${PROJECT_NAME} ${minetest_SRCS})
-       target_link_libraries(
+       add_dependencies(${PROJECT_NAME} GenerateVersion)
+       set(minetest_LIBS
                ${PROJECT_NAME}
                ${ZLIB_LIBRARIES}
                ${IRRLICHT_LIBRARY}
@@ -298,26 +529,77 @@ if(BUILD_CLIENT)
                ${X11_LIBRARIES}
                ${GETTEXT_LIBRARY}
                ${SOUND_LIBRARIES}
-               ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
                ${LUA_LIBRARY}
+               ${JSON_LIBRARY}
+               ${OPENGLES2_LIBRARIES}
                ${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}
+                       ${CURL_LIBRARY}
+               )
+       endif(USE_CURL)
+       if(USE_FREETYPE)
+               if(FREETYPE_PKGCONFIG_FOUND)
+                       set_target_properties(${PROJECT_NAME}
+                               PROPERTIES
+                               COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
+                       )
+               endif(FREETYPE_PKGCONFIG_FOUND)
+               target_link_libraries(
+                       ${PROJECT_NAME}
+                       ${FREETYPE_LIBRARY}
+                       ${CGUITTFONT_LIBRARY}
+               )
+       endif(USE_FREETYPE)
+       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)
        add_executable(${PROJECT_NAME}server ${minetestserver_SRCS})
+       add_dependencies(${PROJECT_NAME}server GenerateVersion)
        target_link_libraries(
                ${PROJECT_NAME}server
                ${ZLIB_LIBRARIES}
-               ${JTHREAD_LIBRARY}
                ${SQLITE3_LIBRARY}
+               ${JSON_LIBRARY}
+               ${GETTEXT_LIBRARY}
                ${LUA_LIBRARY}
                ${PLATFORM_LIBS}
        )
+       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
+                       ${CURL_LIBRARY}
+               )
+       endif(USE_CURL)
 endif(BUILD_SERVER)
 
+
 #
 # Set some optimizations and tweaks
 #
@@ -339,7 +621,7 @@ if(MSVC)
        # Flags for C files (sqlite)
        # /MT = Link statically with standard library stuff
        set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT")
-       
+
        if(BUILD_SERVER)
                set_target_properties(${PROJECT_NAME}server PROPERTIES
                                COMPILE_DEFINITIONS "SERVER")
@@ -347,13 +629,15 @@ if(MSVC)
 
 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(RELEASE_WARNING_FLAGS "")
        endif()
-       
+
        if(NOT APPLE AND NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
                CHECK_CXX_COMPILER_FLAG("-Wno-unused-but-set-variable" HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
                if(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
@@ -361,22 +645,27 @@ else()
                endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
        endif()
 
+       if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+               # clang does not understand __extern_always_inline but libc headers use it
+               set(OTHER_FLAGS "${OTHER_FLAGS} \"-D__extern_always_inline=extern __always_inline\"")
+       endif()
+
        if(MINGW)
                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)
                set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
        endif()
-       
+
        if(BUILD_SERVER)
                set_target_properties(${PROJECT_NAME}server PROPERTIES
                                COMPILE_DEFINITIONS "SERVER")
@@ -391,12 +680,6 @@ endif()
 # Installation
 #
 if(WIN32)
-       if(MINGWM10_DLL)
-               install(FILES ${MINGWM10_DLL} DESTINATION ${BINDIR})
-       endif()
-       if(DEFINED ZLIB_DLL)
-               install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
-       endif()
        if(USE_SOUND)
                if(OPENAL_DLL)
                        install(FILES ${OPENAL_DLL} DESTINATION ${BINDIR})
@@ -411,6 +694,24 @@ if(WIN32)
                        install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR})
                endif()
        endif()
+       if(CURL_DLL)
+               install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
+       endif()
+       if(ZLIB_DLL)
+               install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
+       endif()
+       if(ZLIBWAPI_DLL)
+               install(FILES ${ZLIBWAPI_DLL} DESTINATION ${BINDIR})
+       endif()
+       if(FREETYPE_DLL)
+               install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
+       endif()
+       if(SQLITE3_DLL)
+               install(FILES ${SQLITE3_DLL} DESTINATION ${BINDIR})
+       endif()
+       if(LEVELDB_DLL)
+               install(FILES ${LEVELDB_DLL} DESTINATION ${BINDIR})
+       endif()
 endif()
 
 if(BUILD_CLIENT)
@@ -471,19 +772,18 @@ endif(USE_GETTEXT)
 
 # Subdirectories
 
-if (JTHREAD_FOUND)
-else (JTHREAD_FOUND)
-       add_subdirectory(jthread)
-endif (JTHREAD_FOUND)
-
 if (SQLITE3_FOUND)
 else (SQLITE3_FOUND)
        add_subdirectory(sqlite)
 endif (SQLITE3_FOUND)
 
-if (LUA_FOUND)
-else (LUA_FOUND)
-       add_subdirectory(lua)
-endif (LUA_FOUND)
+if (BUILD_CLIENT AND USE_FREETYPE)
+       add_subdirectory(cguittfont)
+endif (BUILD_CLIENT AND USE_FREETYPE)
+
+if (JSON_FOUND)
+else (JSON_FOUND)
+       add_subdirectory(json)
+endif (JSON_FOUND)
 
 #end