Move ServerEnvironment to dedicated cpp/header files

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3eda27953f19bb35f170295db83863b2ee5e6813..f90542be9e79a80f5eab5b2357f14d679ead7186 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -445,11 +445,14 @@ set(common_SRCS
        porting.cpp
        profiler.cpp
        quicktune.cpp
+       reflowscan.cpp
        remoteplayer.cpp
+       raycast.cpp
        rollback.cpp
        rollback_interface.cpp
        serialization.cpp
        server.cpp
+       serverenvironment.cpp
        serverlist.cpp
        serverobject.cpp
        settings.cpp
@@ -458,6 +461,7 @@ set(common_SRCS
        staticobject.cpp
        subgame.cpp
        terminal_chat_console.cpp
+       tileanimation.cpp
        tool.cpp
        treegen.cpp
        version.cpp
@@ -474,6 +478,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")
@@ -486,7 +491,7 @@ if(WIN32)
                        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})
+               set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE} ${MINETEST_EXE_MANIFEST_FILE})
        endif(MINGW)
 endif()
 
@@ -504,6 +509,7 @@ set(client_SRCS
        ${client_irrlicht_changes_SRCS}
        camera.cpp
        client.cpp
+       clientenvironment.cpp
        clientmap.cpp
        clientmedia.cpp
        clientobject.cpp
@@ -687,6 +693,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
 
@@ -696,9 +724,9 @@ if(MSVC)
        # Visual Studio
 
        # 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 /MT /GS- /Zi /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
        #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 /DEBUG /OPT:REF /OPT:ICF")
 
        set(CMAKE_CXX_FLAGS_SEMIDEBUG "/MDd /Zi /Ob0 /O1 /RTC1")
 
@@ -805,7 +833,7 @@ 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})
@@ -834,7 +862,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")