Send only changed node metadata to clients instead of whole mapblock (#5268)

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05446c08400a502fb6f65af123410efa2d351832..8218d586c85a27556279f4540d8fbc2d28301786 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -397,12 +397,14 @@ set(common_SRCS
        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
@@ -482,34 +484,6 @@ set(client_SRCS
        ${gui_SRCS}
        ${client_network_SRCS}
        ${client_irrlicht_changes_SRCS}
-       camera.cpp
-       client.cpp
-       clientenvironment.cpp
-       clientmap.cpp
-       clientmedia.cpp
-       clientobject.cpp
-       clouds.cpp
-       content_cao.cpp
-       content_cso.cpp
-       content_mapblock.cpp
-       convert_json.cpp
-       filecache.cpp
-       fontengine.cpp
-       game.cpp
-       guiscalingfilter.cpp
-       hud.cpp
-       imagefilters.cpp
-       keycode.cpp
-       localplayer.cpp
-       main.cpp
-       mapblock_mesh.cpp
-       mesh.cpp
-       mesh_generator_thread.cpp
-       minimap.cpp
-       particles.cpp
-       shader.cpp
-       sky.cpp
-       wieldmesh.cpp
        ${client_SCRIPT_SRCS}
        ${UNITTEST_CLIENT_SRCS}
 )
@@ -518,7 +492,6 @@ list(SORT client_SRCS)
 # Server sources
 set(server_SRCS
        ${common_SRCS}
-       main.cpp
 )
 list(SORT server_SRCS)
 
@@ -696,7 +669,7 @@ 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 /GL /FD /MT /GS- /Zi /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()
@@ -714,8 +687,8 @@ 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
@@ -828,6 +801,14 @@ if(BUILD_CLIENT)
                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})