]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/CMakeLists.txt
Send only changed node metadata to clients instead of whole mapblock (#5268)
[dragonfireclient.git] / src / CMakeLists.txt
index 190f4e9bd9d079056093975522d387e3ff3a7a0c..8218d586c85a27556279f4540d8fbc2d28301786 100644 (file)
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.6)
 project(minetest)
 
 INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckLibraryExists)
 
 # Add custom SemiDebug build mode
 set(CMAKE_CXX_FLAGS_SEMIDEBUG "-O1 -g -Wall -Wabi" CACHE STRING
@@ -27,6 +28,12 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
 
 
+if(NOT (BUILD_CLIENT OR BUILD_SERVER))
+       message(WARNING "Neither BUILD_CLIENT nor BUILD_SERVER is set! Setting BUILD_SERVER=true")
+       set(BUILD_SERVER TRUE)
+endif()
+
+
 option(ENABLE_CURL "Enable cURL support for fetching media" TRUE)
 set(USE_CURL FALSE)
 
@@ -40,8 +47,17 @@ else()
        mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
 endif()
 
+if(NOT USE_CURL)
+       if(BUILD_CLIENT)
+               message(WARNING "cURL is required to load the server list")
+       endif()
+       if(BUILD_SERVER)
+               message(WARNING "cURL is required to announce to the server list")
+       endif()
+endif()
+
 
-option(ENABLE_GETTEXT "Use GetText for internationalization" FALSE)
+option(ENABLE_GETTEXT "Use GetText for internationalization" TRUE)
 set(USE_GETTEXT FALSE)
 
 if(ENABLE_GETTEXT)
@@ -85,19 +101,6 @@ if(BUILD_CLIENT AND ENABLE_SOUND)
        endif()
 endif()
 
-if(USE_SOUND)
-       set(sound_SRCS sound_openal.cpp)
-       set(SOUND_INCLUDE_DIRS
-               ${OPENAL_INCLUDE_DIR}
-               ${VORBIS_INCLUDE_DIR}
-               ${OGG_INCLUDE_DIR}
-               )
-       set(SOUND_LIBRARIES
-               ${OPENAL_LIBRARY}
-               ${VORBIS_LIBRARIES}
-               )
-endif()
-
 
 option(ENABLE_GLES "Enable OpenGL ES support" FALSE)
 mark_as_advanced(ENABLE_GLES)
@@ -135,15 +138,52 @@ if(ENABLE_FREETYPE)
        if(FREETYPE_FOUND)
                message(STATUS "Freetype enabled.")
                set(USE_FREETYPE TRUE)
-               set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont")
-               set(CGUITTFONT_LIBRARY cguittfont)
        endif()
 endif(ENABLE_FREETYPE)
 
+option(ENABLE_CURSES "Enable ncurses console" TRUE)
+set(USE_CURSES FALSE)
 
-find_package(Lua REQUIRED)
-
-find_package(GMP REQUIRED)
+if(ENABLE_CURSES)
+       find_package(Ncursesw)
+       if(CURSES_FOUND)
+               set(USE_CURSES TRUE)
+               message(STATUS "ncurses console enabled.")
+               include_directories(${CURSES_INCLUDE_DIRS})
+       else()
+               message(STATUS "ncurses not found!")
+       endif()
+endif(ENABLE_CURSES)
+
+option(ENABLE_POSTGRESQL "Enable PostgreSQL backend" TRUE)
+set(USE_POSTGRESQL FALSE)
+
+if(ENABLE_POSTGRESQL)
+       find_program(POSTGRESQL_CONFIG_EXECUTABLE pg_config DOC "pg_config")
+       find_library(POSTGRESQL_LIBRARY pq)
+       if(POSTGRESQL_CONFIG_EXECUTABLE)
+               execute_process(COMMAND ${POSTGRESQL_CONFIG_EXECUTABLE} --includedir-server
+                       OUTPUT_VARIABLE POSTGRESQL_SERVER_INCLUDE_DIRS
+                       OUTPUT_STRIP_TRAILING_WHITESPACE)
+               execute_process(COMMAND ${POSTGRESQL_CONFIG_EXECUTABLE}
+                       OUTPUT_VARIABLE POSTGRESQL_CLIENT_INCLUDE_DIRS
+                       OUTPUT_STRIP_TRAILING_WHITESPACE)
+               # This variable is case sensitive for the cmake PostgreSQL module
+               set(PostgreSQL_ADDITIONAL_SEARCH_PATHS ${POSTGRESQL_SERVER_INCLUDE_DIRS} ${POSTGRESQL_CLIENT_INCLUDE_DIRS})
+       endif()
+
+       find_package("PostgreSQL")
+
+       if(POSTGRESQL_FOUND)
+               set(USE_POSTGRESQL TRUE)
+               message(STATUS "PostgreSQL backend enabled")
+               # This variable is case sensitive, don't try to change it to POSTGRESQL_INCLUDE_DIR
+               message(STATUS "PostgreSQL includes: ${PostgreSQL_INCLUDE_DIR}")
+               include_directories(${PostgreSQL_INCLUDE_DIR})
+       else()
+               message(STATUS "PostgreSQL not found!")
+       endif()
+endif(ENABLE_POSTGRESQL)
 
 option(ENABLE_LEVELDB "Enable LevelDB backend" TRUE)
 set(USE_LEVELDB FALSE)
@@ -178,13 +218,33 @@ endif(ENABLE_REDIS)
 
 
 find_package(SQLite3 REQUIRED)
-find_package(Json REQUIRED)
+
+OPTION(ENABLE_SPATIAL "Enable SpatialIndex AreaStore backend" TRUE)
+set(USE_SPATIAL FALSE)
+
+if(ENABLE_SPATIAL)
+       find_library(SPATIAL_LIBRARY spatialindex)
+       find_path(SPATIAL_INCLUDE_DIR spatialindex/SpatialIndex.h)
+       if(SPATIAL_LIBRARY AND SPATIAL_INCLUDE_DIR)
+               set(USE_SPATIAL TRUE)
+               message(STATUS "SpatialIndex AreaStore backend enabled.")
+               include_directories(${SPATIAL_INCLUDE_DIR})
+       else(SPATIAL_LIBRARY AND SPATIAL_INCLUDE_DIR)
+               message(STATUS "SpatialIndex not found!")
+       endif(SPATIAL_LIBRARY AND SPATIAL_INCLUDE_DIR)
+endif(ENABLE_SPATIAL)
 
 
 if(NOT MSVC)
        set(USE_GPROF FALSE CACHE BOOL "Use -pg flag for g++")
 endif()
 
+# Haiku endian support
+if(HAIKU)
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_BSD_SOURCE")
+endif()
+
 # Use cmake_config.h
 add_definitions(-DUSE_CMAKE_CONFIG_H)
 
@@ -194,18 +254,23 @@ if(WIN32)
                set(PLATFORM_LIBS dbghelp.lib ${PLATFORM_LIBS})
                # Surpress some useless warnings
                add_definitions ( /D "_CRT_SECURE_NO_DEPRECATE" /W1 )
+               # Get M_PI to work
+               add_definitions(/D "_USE_MATH_DEFINES")
+               # Dont define min/max macros in minwindef.h
+               add_definitions(/D "NOMINMAX")
        else() # Probably MinGW = GCC
                set(PLATFORM_LIBS "")
        endif()
-       set(PLATFORM_LIBS ws2_32.lib shlwapi.lib ${PLATFORM_LIBS})
+       set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib ${PLATFORM_LIBS})
 
        # Zlib stuff
        set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
                        CACHE PATH "Zlib include directory")
        set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.lib"
-                       CACHE FILEPATH "Path to zlibwapi.lib")
+                       CACHE FILEPATH "Path to zlib library (usually zlibwapi.lib)")
        set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
-                       CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
+                       CACHE FILEPATH "Path to zlib DLL (for installation)")
+       set(ZLIBWAPI_DLL "" CACHE FILEPATH "Path to zlibwapi DLL")
        set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
                        CACHE PATH "irrlicht dir")
        if(USE_FREETYPE)
@@ -222,10 +287,20 @@ if(WIN32)
                set(VORBIS_DLL "" CACHE FILEPATH "Path to libvorbis.dll for installation (optional)")
                set(VORBISFILE_DLL "" CACHE FILEPATH "Path to libvorbisfile.dll for installation (optional)")
        endif()
+       if(USE_LUAJIT)
+               set(LUA_DLL "" CACHE FILEPATH "Path to lua51.dll for installation (optional)")
+       endif()
 else()
        # Unix probably
        if(BUILD_CLIENT)
-               find_package(X11 REQUIRED)
+               if(NOT HAIKU)
+                       find_package(X11 REQUIRED)
+               endif(NOT HAIKU)
+
+               set(OPENGL_GL_PREFERENCE "LEGACY" CACHE STRING
+                       "See CMake Policy CMP0072 for reference. GLVND is broken on some nvidia setups")
+               set(OpenGL_GL_PREFERENCE ${OPENGL_GL_PREFERENCE})
+
                find_package(OpenGL REQUIRED)
                find_package(JPEG REQUIRED)
                find_package(BZip2 REQUIRED)
@@ -247,13 +322,25 @@ else()
        if(APPLE)
                set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
        else()
-               set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+               check_library_exists(rt clock_gettime "" HAVE_LIBRT)
+               if (HAVE_LIBRT)
+                       set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
+               endif(HAVE_LIBRT)
        endif(APPLE)
-       #set(CLIENT_PLATFORM_LIBS -lXxf86vm)
+
+       if(NOT HAIKU AND NOT APPLE)
        # This way Xxf86vm is found on OpenBSD too
-       find_library(XXF86VM_LIBRARY Xxf86vm)
-       mark_as_advanced(XXF86VM_LIBRARY)
-       set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
+               find_library(XXF86VM_LIBRARY Xxf86vm)
+               mark_as_advanced(XXF86VM_LIBRARY)
+               set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
+       endif(NOT HAIKU AND NOT APPLE)
+
+       # Prefer local iconv if installed
+       find_library(ICONV_LIBRARY iconv)
+       mark_as_advanced(ICONV_LIBRARY)
+       if (ICONV_LIBRARY)
+               set(PLATFORM_LIBS ${PLATFORM_LIBS} ${ICONV_LIBRARY})
+       endif()
 endif()
 
 check_include_files(endian.h HAVE_ENDIAN_H)
@@ -275,56 +362,56 @@ add_custom_target(GenerateVersion
        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 
 
-add_subdirectory(jthread)
+add_subdirectory(threading)
+add_subdirectory(content)
+add_subdirectory(database)
+add_subdirectory(gui)
+add_subdirectory(mapgen)
 add_subdirectory(network)
 add_subdirectory(script)
 add_subdirectory(unittest)
 add_subdirectory(util)
+add_subdirectory(irrlicht_changes)
+add_subdirectory(server)
 
 set(common_SRCS
+       ${database_SRCS}
+       ${mapgen_SRCS}
+       ${server_SRCS}
+       ${content_SRCS}
        ban.cpp
-       cavegen.cpp
+       chat.cpp
        clientiface.cpp
        collision.cpp
-       content_abm.cpp
        content_mapnode.cpp
        content_nodemeta.cpp
        content_sao.cpp
        convert_json.cpp
        craftdef.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
+       face_position_cache.cpp
        filesys.cpp
        genericobject.cpp
        gettext.cpp
        httpfetch.cpp
+       hud.cpp
        inventory.cpp
        inventorymanager.cpp
        itemdef.cpp
+       itemstackmetadata.cpp
        light.cpp
        log.cpp
+       main.cpp
        map.cpp
+       map_settings_manager.cpp
        mapblock.cpp
-       mapgen.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
+       metadata.cpp
+       modchannels.cpp
        nameidmapping.cpp
        nodedef.cpp
        nodemetadata.cpp
@@ -337,22 +424,26 @@ set(common_SRCS
        porting.cpp
        profiler.cpp
        quicktune.cpp
+       raycast.cpp
+       reflowscan.cpp
+       remoteplayer.cpp
        rollback.cpp
        rollback_interface.cpp
        serialization.cpp
        server.cpp
+       serverenvironment.cpp
        serverlist.cpp
        serverobject.cpp
        settings.cpp
-       socket.cpp
-       sound.cpp
        staticobject.cpp
-       subgame.cpp
+       terminal_chat_console.cpp
+       tileanimation.cpp
        tool.cpp
-       treegen.cpp
+       translation.cpp
        version.cpp
        voxel.cpp
        voxelalgorithms.cpp
+       hud.cpp
        ${common_network_SRCS}
        ${JTHREAD_SRCS}
        ${common_SCRIPT_SRCS}
@@ -364,6 +455,7 @@ set(common_SRCS
 # This gives us the icon and file version information
 if(WIN32)
        set(WINRESOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc")
+       set(MINETEST_EXE_MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/minetest.exe.manifest")
        if(MINGW)
                if(NOT CMAKE_RC_COMPILER)
                        set(CMAKE_RC_COMPILER "windres.exe")
@@ -374,9 +466,9 @@ if(WIN32)
                        -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                        DEPENDS ${WINRESOURCE_FILE})
-               SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
+               SET(extra_windows_SRCS ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
        else(MINGW) # Probably MSVC
-               set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE})
+               set(extra_windows_SRCS ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})
        endif(MINGW)
 endif()
 
@@ -389,54 +481,27 @@ endif(BUILD_CLIENT)
 set(client_SRCS
        ${client_SRCS}
        ${common_SRCS}
-       ${sound_SRCS}
+       ${gui_SRCS}
        ${client_network_SRCS}
-       camera.cpp
-       chat.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
-       fontengine.cpp
-       game.cpp
-       guiChatConsole.cpp
-       guiEngine.cpp
-       guiFileSelectMenu.cpp
-       guiFormSpecMenu.cpp
-       guiKeyChangeMenu.cpp
-       guiPasswordChange.cpp
-       guiscalingfilter.cpp
-       guiTable.cpp
-       guiVolumeChange.cpp
-       hud.cpp
-       imagefilters.cpp
-       keycode.cpp
-       localplayer.cpp
-       main.cpp
-       mapblock_mesh.cpp
-       mesh.cpp
-       particles.cpp
-       shader.cpp
-       sky.cpp
-       wieldmesh.cpp
+       ${client_irrlicht_changes_SRCS}
        ${client_SCRIPT_SRCS}
+       ${UNITTEST_CLIENT_SRCS}
 )
 list(SORT client_SRCS)
 
 # Server sources
 set(server_SRCS
        ${common_SRCS}
-       main.cpp
 )
 list(SORT server_SRCS)
 
+# Avoid source_group on broken CMake version.
+# see issue #7074 #7075
+if (CMAKE_VERSION VERSION_GREATER 3.8.1)
+       source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${client_SRCS})
+       source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
+endif()
+
 include_directories(
        ${PROJECT_BINARY_DIR}
        ${PROJECT_SOURCE_DIR}
@@ -450,12 +515,13 @@ include_directories(
        ${LUA_INCLUDE_DIR}
        ${GMP_INCLUDE_DIR}
        ${JSON_INCLUDE_DIR}
+       ${X11_INCLUDE_DIR}
        ${PROJECT_SOURCE_DIR}/script
 )
 
 
 if(USE_FREETYPE)
-       include_directories(${FREETYPE_INCLUDE_DIRS} ${CGUITTFONT_INCLUDE_DIR})
+       include_directories(${FREETYPE_INCLUDE_DIRS})
 endif()
 
 if(USE_CURL)
@@ -467,7 +533,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 
 if(BUILD_CLIENT)
-       add_executable(${PROJECT_NAME} ${client_SRCS})
+       add_executable(${PROJECT_NAME} ${client_SRCS} ${extra_windows_SRCS})
        add_dependencies(${PROJECT_NAME} GenerateVersion)
        set(client_LIBS
                ${PROJECT_NAME}
@@ -514,20 +580,28 @@ if(BUILD_CLIENT)
                target_link_libraries(
                        ${PROJECT_NAME}
                        ${FREETYPE_LIBRARY}
-                       ${CGUITTFONT_LIBRARY}
                )
        endif()
+       if (USE_CURSES)
+               target_link_libraries(${PROJECT_NAME} ${CURSES_LIBRARIES})
+       endif()
+       if (USE_POSTGRESQL)
+               target_link_libraries(${PROJECT_NAME} ${POSTGRESQL_LIBRARY})
+       endif()
        if (USE_LEVELDB)
                target_link_libraries(${PROJECT_NAME} ${LEVELDB_LIBRARY})
        endif()
        if (USE_REDIS)
                target_link_libraries(${PROJECT_NAME} ${REDIS_LIBRARY})
        endif()
+       if (USE_SPATIAL)
+               target_link_libraries(${PROJECT_NAME} ${SPATIAL_LIBRARY})
+       endif()
 endif(BUILD_CLIENT)
 
 
 if(BUILD_SERVER)
-       add_executable(${PROJECT_NAME}server ${server_SRCS})
+       add_executable(${PROJECT_NAME}server ${server_SRCS} ${extra_windows_SRCS})
        add_dependencies(${PROJECT_NAME}server GenerateVersion)
        target_link_libraries(
                ${PROJECT_NAME}server
@@ -541,12 +615,21 @@ if(BUILD_SERVER)
        )
        set_target_properties(${PROJECT_NAME}server PROPERTIES
                        COMPILE_DEFINITIONS "SERVER")
+       if (USE_CURSES)
+               target_link_libraries(${PROJECT_NAME}server ${CURSES_LIBRARIES})
+       endif()
+       if (USE_POSTGRESQL)
+               target_link_libraries(${PROJECT_NAME}server ${POSTGRESQL_LIBRARY})
+       endif()
        if (USE_LEVELDB)
                target_link_libraries(${PROJECT_NAME}server ${LEVELDB_LIBRARY})
        endif()
        if (USE_REDIS)
                target_link_libraries(${PROJECT_NAME}server ${REDIS_LIBRARY})
        endif()
+       if (USE_SPATIAL)
+               target_link_libraries(${PROJECT_NAME}server ${SPATIAL_LIBRARY})
+       endif()
        if(USE_CURL)
                target_link_libraries(
                        ${PROJECT_NAME}server
@@ -555,6 +638,28 @@ if(BUILD_SERVER)
        endif()
 endif(BUILD_SERVER)
 
+# Blacklisted locales that don't work.
+# see issue #4638
+set(GETTEXT_BLACKLISTED_LOCALES
+       be
+       he
+       ko
+       ky
+       zh_CN
+       zh_TW
+)
+
+option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)
+
+if (GETTEXT_FOUND AND APPLY_LOCALE_BLACKLIST)
+       set(GETTEXT_USED_LOCALES "")
+       foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+               if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")
+                       list(APPEND GETTEXT_USED_LOCALES ${LOCALE})
+               endif()
+       endforeach()
+       message(STATUS "Locale blacklist applied; Locales used: ${GETTEXT_USED_LOCALES}")
+endif()
 
 # Set some optimizations and tweaks
 
@@ -562,11 +667,18 @@ include(CheckCXXCompilerFlag)
 
 if(MSVC)
        # Visual Studio
-
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D WIN32_LEAN_AND_MEAN /MP")
        # EHa enables SEH exceptions (used for catching segfaults)
-       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /Ob2 /Oi /Ot /Oy /GL /FD /MT /GS- /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
+       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MD /GS- /Zi /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
+       if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+               set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:SSE")
+       endif()
        #set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"")
-       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG")
+       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF")
+
+
+       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
+
 
        set(CMAKE_CXX_FLAGS_SEMIDEBUG "/MDd /Zi /Ob0 /O1 /RTC1")
 
@@ -575,12 +687,13 @@ if(MSVC)
        set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Ob0 /Od /RTC1")
 
        # Flags for C files (sqlite)
-       # /MT = Link statically with standard library stuff
-       set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT")
+       # /MD = dynamically link to MSVCRxxx.dll
+       set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MD")
 else()
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
        # Probably GCC
        if(APPLE)
-               SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
+               SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
        endif()
        if(WARN_ALL)
                set(RELEASE_WARNING_FLAGS "-Wall")
@@ -594,22 +707,33 @@ else()
                set(OTHER_FLAGS "${OTHER_FLAGS} -Wsign-compare")
        endif()
 
+       if(WIN32 AND NOT ZLIBWAPI_DLL AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+               set(OTHER_FLAGS "${OTHER_FLAGS} -DWIN32_NO_ZLIB_WINAPI")
+               message(WARNING "Defaulting to cdecl for zlib on win32 because ZLIBWAPI_DLL"
+                       " isn't set, ensure that ZLIBWAPI_DLL is set if you want stdcall.")
+       endif()
+
        if(MINGW)
-               set(OTHER_FLAGS "-mthreads -fexceptions")
+               set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
+               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_LEAN_AND_MEAN")
        endif()
 
-       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -ffast-math -Wall -pipe -funroll-loops")
-       if(APPLE)
+       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
+       if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
                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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fomit-frame-pointer")
+       endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
        set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}")
        set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wabi ${WARNING_FLAGS} ${OTHER_FLAGS}")
 
        if(USE_GPROF)
                set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
        endif()
+
+       if(MINGW)
+               set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mwindows")
+       endif()
 endif()
 
 
@@ -648,6 +772,9 @@ if(WIN32)
        if(LEVELDB_DLL)
                install(FILES ${LEVELDB_DLL} DESTINATION ${BINDIR})
        endif()
+       if(LUA_DLL)
+               install(FILES ${LUA_DLL} DESTINATION ${BINDIR})
+       endif()
 endif()
 
 if(BUILD_CLIENT)
@@ -667,13 +794,21 @@ if(BUILD_CLIENT)
        endif()
 
        if(USE_GETTEXT)
-               foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+               foreach(LOCALE ${GETTEXT_USED_LOCALES})
                        set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
                        set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
                        install(FILES ${MO_BUILD_PATH} DESTINATION ${MO_DEST_PATH})
                endforeach()
        endif()
 
+       if(USE_FREETYPE)
+               install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
+                               FILES_MATCHING PATTERN "*.ttf" PATTERN "*.txt")
+       else()
+               install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
+                               FILES_MATCHING PATTERN "*.png" PATTERN "*.xml")
+       endif()
+
        if(WIN32)
                if(DEFINED IRRLICHT_DLL)
                        install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
@@ -696,7 +831,7 @@ endif()
 if (USE_GETTEXT)
        set(MO_FILES)
 
-       foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+       foreach(LOCALE ${GETTEXT_USED_LOCALES})
                set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME}.po")
                set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
                set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
@@ -718,11 +853,3 @@ if (USE_GETTEXT)
 
        add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES})
 endif()
-
-
-# Subdirectories
-
-if (BUILD_CLIENT AND USE_FREETYPE)
-       add_subdirectory(cguittfont)
-endif()
-