Footsteps: Fix offset footstep and shallow water sound bugs

[oweals/minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1983bb07844562d3e1c7ae77fd3fb7c6ba369986..30e6c85e4bb0dac6e37dede80f46cfc14f40d1ee 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -284,6 +284,8 @@ 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")
        else() # Probably MinGW = GCC
                set(PLATFORM_LIBS "")
        endif()
@@ -413,6 +415,7 @@ set(common_SRCS
        inventory.cpp
        inventorymanager.cpp
        itemdef.cpp
+       itemstackmetadata.cpp
        light.cpp
        log.cpp
        map.cpp
@@ -428,6 +431,7 @@ set(common_SRCS
        mapgen_valleys.cpp
        mapnode.cpp
        mapsector.cpp
+       metadata.cpp
        mg_biome.cpp
        mg_decoration.cpp
        mg_ore.cpp
@@ -445,11 +449,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 +465,7 @@ set(common_SRCS
        staticobject.cpp
        subgame.cpp
        terminal_chat_console.cpp
+       tileanimation.cpp
        tool.cpp
        treegen.cpp
        version.cpp
@@ -505,6 +513,7 @@ set(client_SRCS
        ${client_irrlicht_changes_SRCS}
        camera.cpp
        client.cpp
+       clientenvironment.cpp
        clientmap.cpp
        clientmedia.cpp
        clientobject.cpp
@@ -688,6 +697,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
 
@@ -806,7 +837,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})
@@ -835,7 +866,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")
@@ -864,4 +895,3 @@ endif()
 if (BUILD_CLIENT AND USE_FREETYPE)
        add_subdirectory(cguittfont)
 endif()
-