]> git.lizzy.rs Git - minetest.git/blobdiff - src/CMakeLists.txt
Defer searching for libintl to CMake
[minetest.git] / src / CMakeLists.txt
index dd68ceec9d759e07b6832815103de3e56ef79d64..1f1e987f79566f2416b35e699c8e3116dfec080f 100644 (file)
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 project(minetest)
 
 INCLUDE(CheckIncludeFiles)
@@ -57,7 +55,7 @@ if(NOT USE_CURL)
 endif()
 
 
-option(ENABLE_GETTEXT "Use GetText for internationalization" TRUE)
+option(ENABLE_GETTEXT "Use GetText for internationalization" ${BUILD_CLIENT})
 set(USE_GETTEXT FALSE)
 
 if(ENABLE_GETTEXT)
@@ -65,14 +63,13 @@ if(ENABLE_GETTEXT)
        if(GETTEXTLIB_FOUND)
                if(WIN32)
                        message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
-                       message(STATUS "GetText DLL: ${GETTEXT_DLL}")
-                       message(STATUS "GetText iconv DLL: ${GETTEXT_ICONV_DLL}")
+                       message(STATUS "GetText DLL(s): ${GETTEXT_DLL}")
                endif()
                set(USE_GETTEXT TRUE)
                message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
        endif(GETTEXTLIB_FOUND)
 else()
-       mark_as_advanced(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
+       mark_as_advanced(GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
        message(STATUS "GetText disabled.")
 endif()
 
@@ -101,56 +98,18 @@ if(BUILD_CLIENT AND ENABLE_SOUND)
        endif()
 endif()
 
-
-option(ENABLE_GLES "Use OpenGL ES instead of OpenGL" FALSE)
+# TODO: this should be removed one day, we can enable it unconditionally
+option(ENABLE_GLES "Enable extra support code for OpenGL ES" FALSE)
 mark_as_advanced(ENABLE_GLES)
-if(BUILD_CLIENT)
-       if(ENABLE_GLES)
-               find_package(OpenGLES2 REQUIRED)
-       else()
-               # transitive dependency from Irrlicht (see longer explanation below)
-               if(NOT WIN32)
-                       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)
-               endif()
-       endif()
+option(ENABLE_TOUCH "Enable Touchscreen support" FALSE)
+if(ENABLE_TOUCH)
+       add_definitions(-DHAVE_TOUCHSCREENGUI)
 endif()
 
-
-option(ENABLE_FREETYPE "Enable FreeType2 (TrueType fonts and basic unicode support)" TRUE)
-set(USE_FREETYPE FALSE)
-
-if(ENABLE_FREETYPE)
-##
-## Note: FindFreetype.cmake seems to have been fixed in recent versions of
-## CMake. If issues persist, re-enable this workaround specificially for the
-## failing platforms.
-##
-#      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)
-#      endif()
-       find_package(Freetype)
-       if(FREETYPE_FOUND)
-               message(STATUS "Freetype enabled.")
-               set(USE_FREETYPE TRUE)
-       endif()
-endif(ENABLE_FREETYPE)
+if(BUILD_CLIENT)
+       find_package(Freetype REQUIRED)
+endif()
 
 option(ENABLE_CURSES "Enable ncurses console" TRUE)
 set(USE_CURSES FALSE)
@@ -170,7 +129,18 @@ option(ENABLE_POSTGRESQL "Enable PostgreSQL backend" TRUE)
 set(USE_POSTGRESQL FALSE)
 
 if(ENABLE_POSTGRESQL)
-       find_package("PostgreSQL")
+       if(CMAKE_VERSION VERSION_LESS "3.20")
+               find_package(PostgreSQL QUIET)
+               # Before CMake 3.20 FindPostgreSQL.cmake always looked for server includes
+               # but we don't need them, so continue anyway if only those are missing.
+               if(PostgreSQL_INCLUDE_DIR AND PostgreSQL_LIBRARY)
+                       set(PostgreSQL_FOUND TRUE)
+                       set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR})
+                       set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY})
+               endif()
+       else()
+               find_package(PostgreSQL)
+       endif()
 
        if(PostgreSQL_FOUND)
                set(USE_POSTGRESQL TRUE)
@@ -217,6 +187,7 @@ endif(ENABLE_REDIS)
 
 find_package(SQLite3 REQUIRED)
 
+
 OPTION(ENABLE_PROMETHEUS "Enable prometheus client support" FALSE)
 set(USE_PROMETHEUS FALSE)
 
@@ -253,6 +224,10 @@ if(ENABLE_SPATIAL)
 endif(ENABLE_SPATIAL)
 
 
+find_package(ZLIB REQUIRED)
+find_package(Zstd REQUIRED)
+
+
 if(NOT MSVC)
        set(USE_GPROF FALSE CACHE BOOL "Use -pg flag for g++")
 endif()
@@ -279,62 +254,34 @@ if(WIN32)
        else() # Probably MinGW = GCC
                set(PLATFORM_LIBS "")
        endif()
-       set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib ${PLATFORM_LIBS})
+       set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib winmm.lib ${PLATFORM_LIBS})
 
-       # Zlib stuff
-       find_path(ZLIB_INCLUDE_DIR "zlib.h" DOC "Zlib include directory")
-       find_library(ZLIB_LIBRARIES "zlib" DOC "Path to zlib library")
+       set(EXTRA_DLL "" CACHE FILEPATH "Optional paths to additional DLLs that should be packaged")
 
-       # Dll's are automatically copied to the output directory by vcpkg when VCPKG_APPLOCAL_DEPS=ON
+       # DLLs are automatically copied to the output directory by vcpkg when VCPKG_APPLOCAL_DEPS=ON
        if(NOT VCPKG_APPLOCAL_DEPS)
-               find_file(ZLIB_DLL NAMES "zlib.dll" "zlib1.dll" DOC "Path to zlib.dll for installation (optional)")
+               set(ZLIB_DLL "" CACHE FILEPATH "Path to Zlib DLL for installation (optional)")
+               set(ZSTD_DLL "" CACHE FILEPATH "Path to Zstd DLL for installation (optional)")
                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)")
-                       set(VORBIS_DLL "" CACHE FILEPATH "Path to libvorbis.dll for installation (optional)")
-                       set(VORBISFILE_DLL "" CACHE FILEPATH "Path to libvorbisfile.dll for installation (optional)")
+                       set(VORBIS_DLL "" CACHE FILEPATH "Path to Vorbis DLLs for installation (optional)")
+               endif()
+               if(USE_GETTEXT)
+                       set(GETTEXT_DLL "" CACHE FILEPATH "Path to Intl/Iconv DLLs for installation (optional)")
                endif()
                if(USE_LUAJIT)
                        set(LUA_DLL "" CACHE FILEPATH "Path to luajit-5.1.dll for installation (optional)")
                endif()
        endif()
-
 else()
        # Unix probably
        if(BUILD_CLIENT)
                if(NOT HAIKU AND NOT APPLE)
                        find_package(X11 REQUIRED)
                endif(NOT HAIKU AND NOT APPLE)
+       endif()
 
-               ##
-               # The following dependencies are transitive dependencies from Irrlicht.
-               # Minetest itself does not use them, but we link them so that statically
-               # linking Irrlicht works.
-               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})
-               endif(NOT HAIKU AND NOT APPLE)
-
-               find_package(JPEG REQUIRED)
-               find_package(BZip2 REQUIRED)
-               find_package(PNG REQUIRED)
-               if(APPLE)
-                       find_library(CARBON_LIB Carbon REQUIRED)
-                       find_library(COCOA_LIB Cocoa REQUIRED)
-                       find_library(IOKIT_LIB IOKit REQUIRED)
-                       mark_as_advanced(
-                               CARBON_LIB
-                               COCOA_LIB
-                               IOKIT_LIB
-                       )
-                       SET(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${CARBON_LIB} ${COCOA_LIB} ${IOKIT_LIB})
-               endif(APPLE)
-               ##
-       endif(BUILD_CLIENT)
-
-       find_package(ZLIB REQUIRED)
        set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
        if(APPLE)
                set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
@@ -345,12 +292,15 @@ else()
                endif(HAVE_LIBRT)
        endif(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()
+
+       if (HAIKU)
+               set(PLATFORM_LIBS ${PLATFORM_LIBS} network)
+       endif()
 endif()
 
 check_include_files(endian.h HAVE_ENDIAN_H)
@@ -380,6 +330,7 @@ add_subdirectory(mapgen)
 add_subdirectory(network)
 add_subdirectory(script)
 add_subdirectory(unittest)
+add_subdirectory(benchmark)
 add_subdirectory(util)
 add_subdirectory(irrlicht_changes)
 add_subdirectory(server)
@@ -427,6 +378,7 @@ set(common_SRCS
        noise.cpp
        objdef.cpp
        object_properties.cpp
+       particles.cpp
        pathfinder.cpp
        player.cpp
        porting.cpp
@@ -461,6 +413,9 @@ if(BUILD_UNITTESTS)
        set(common_SRCS ${common_SRCS} ${UNITTEST_SRCS})
 endif()
 
+if(BUILD_BENCHMARKS)
+       set(common_SRCS ${common_SRCS} ${BENCHMARK_SRCS})
+endif()
 
 # This gives us the icon and file version information
 if(WIN32)
@@ -501,6 +456,10 @@ if(BUILD_UNITTESTS)
        set(client_SRCS ${client_SRCS} ${UNITTEST_CLIENT_SRCS})
 endif()
 
+if(BUILD_BENCHMARKS)
+       set(client_SRCS ${client_SRCS} ${BENCHMARK_CLIENT_SRCS})
+endif()
+
 list(SORT client_SRCS)
 
 # Server sources
@@ -519,24 +478,28 @@ endif()
 include_directories(
        ${PROJECT_BINARY_DIR}
        ${PROJECT_SOURCE_DIR}
-       ${IRRLICHT_INCLUDE_DIR}
+       ${PROJECT_SOURCE_DIR}/script
+)
+include_directories(SYSTEM
        ${ZLIB_INCLUDE_DIR}
-       ${PNG_INCLUDE_DIR}
-       ${SOUND_INCLUDE_DIRS}
+       ${ZSTD_INCLUDE_DIR}
        ${SQLITE3_INCLUDE_DIR}
        ${LUA_INCLUDE_DIR}
        ${GMP_INCLUDE_DIR}
        ${JSON_INCLUDE_DIR}
-       ${X11_INCLUDE_DIR}
-       ${PROJECT_SOURCE_DIR}/script
+       ${LUA_BIT_INCLUDE_DIR}
 )
 
 if(USE_GETTEXT)
        include_directories(${GETTEXT_INCLUDE_DIR})
 endif()
 
-if(USE_FREETYPE)
-       include_directories(${FREETYPE_INCLUDE_DIRS})
+if(BUILD_CLIENT)
+       include_directories(SYSTEM
+               ${FREETYPE_INCLUDE_DIRS}
+               ${SOUND_INCLUDE_DIRS}
+               ${X11_INCLUDE_DIR}
+       )
 endif()
 
 if(USE_CURL)
@@ -544,43 +507,38 @@ if(USE_CURL)
 endif()
 
 
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
-
+# When cross-compiling assume the user doesn't want to run the executable anyway,
+# otherwise place it in <source dir>/bin/ since Minetest can only run from there.
+if(NOT CMAKE_CROSSCOMPILING)
+       set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
+endif()
 
 if(BUILD_CLIENT)
        add_executable(${PROJECT_NAME} ${client_SRCS} ${extra_windows_SRCS})
        add_dependencies(${PROJECT_NAME} GenerateVersion)
-       set(client_LIBS
+       target_link_libraries(
                ${PROJECT_NAME}
                ${ZLIB_LIBRARIES}
-               ${IRRLICHT_LIBRARY}
-               ${JPEG_LIBRARIES}
-               ${BZIP2_LIBRARIES}
-               ${PNG_LIBRARIES}
+               IrrlichtMt::IrrlichtMt
+               ${ZSTD_LIBRARY}
                ${X11_LIBRARIES}
                ${SOUND_LIBRARIES}
                ${SQLITE3_LIBRARY}
                ${LUA_LIBRARY}
                ${GMP_LIBRARY}
                ${JSON_LIBRARY}
+               ${LUA_BIT_LIBRARY}
+               ${FREETYPE_LIBRARY}
                ${PLATFORM_LIBS}
-               ${CLIENT_PLATFORM_LIBS}
        )
-       target_link_libraries(
-               ${client_LIBS}
-       )
-       if(ENABLE_GLES)
-               target_link_libraries(
-                       ${PROJECT_NAME}
-                       ${OPENGLES2_LIBRARIES}
-                       ${EGL_LIBRARIES}
-               )
-       else()
-               target_link_libraries(
-                       ${PROJECT_NAME}
-                       ${OPENGL_LIBRARIES}
+       if(NOT USE_LUAJIT)
+               set_target_properties(${PROJECT_NAME} PROPERTIES
+                       # This is necessary for dynamic Lua modules
+                       # to work when Lua is statically linked (issue #10806)
+                       ENABLE_EXPORTS 1
                )
        endif()
+
        if(USE_GETTEXT)
                target_link_libraries(
                        ${PROJECT_NAME}
@@ -593,17 +551,11 @@ if(BUILD_CLIENT)
                        ${CURL_LIBRARY}
                )
        endif()
-       if(USE_FREETYPE)
-               if(FREETYPE_PKGCONFIG_FOUND)
-                       set_target_properties(${PROJECT_NAME}
-                               PROPERTIES
-                               COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
-                       )
-               endif()
-               target_link_libraries(
-                       ${PROJECT_NAME}
-                       ${FREETYPE_LIBRARY}
-               )
+       if(FREETYPE_PKGCONFIG_FOUND)
+               set_target_properties(${PROJECT_NAME}
+                       PROPERTIES
+                       COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
+       )
        endif()
        if (USE_CURSES)
                target_link_libraries(${PROJECT_NAME} ${CURSES_LIBRARIES})
@@ -623,23 +575,41 @@ if(BUILD_CLIENT)
        if (USE_SPATIAL)
                target_link_libraries(${PROJECT_NAME} ${SPATIAL_LIBRARY})
        endif()
+       if(BUILD_BENCHMARKS)
+               target_link_libraries(${PROJECT_NAME} catch2)
+       endif()
 endif(BUILD_CLIENT)
 
 
 if(BUILD_SERVER)
        add_executable(${PROJECT_NAME}server ${server_SRCS} ${extra_windows_SRCS})
        add_dependencies(${PROJECT_NAME}server GenerateVersion)
+
+       get_target_property(
+               IRRLICHT_INCLUDES IrrlichtMt::IrrlichtMt INTERFACE_INCLUDE_DIRECTORIES)
+       # Doesn't work without PRIVATE/PUBLIC/INTERFACE mode specified.
+       target_include_directories(${PROJECT_NAME}server PRIVATE ${IRRLICHT_INCLUDES})
        target_link_libraries(
                ${PROJECT_NAME}server
                ${ZLIB_LIBRARIES}
+               ${ZSTD_LIBRARY}
                ${SQLITE3_LIBRARY}
                ${JSON_LIBRARY}
                ${LUA_LIBRARY}
+               ${LUA_BIT_LIBRARY}
                ${GMP_LIBRARY}
                ${PLATFORM_LIBS}
        )
        set_target_properties(${PROJECT_NAME}server PROPERTIES
-                       COMPILE_DEFINITIONS "SERVER")
+               COMPILE_DEFINITIONS "SERVER")
+       if(NOT USE_LUAJIT)
+               set_target_properties(${PROJECT_NAME}server PROPERTIES
+                       # This is necessary for dynamic Lua modules
+                       # to work when Lua is statically linked (issue #10806)
+                       ENABLE_EXPORTS 1
+               )
+       endif()
+
        if (USE_GETTEXT)
                target_link_libraries(${PROJECT_NAME}server ${GETTEXT_LIBRARY})
        endif()
@@ -667,50 +637,85 @@ if(BUILD_SERVER)
                        ${CURL_LIBRARY}
                )
        endif()
+       if(BUILD_BENCHMARKS)
+               target_link_libraries(${PROJECT_NAME}server catch2)
+       endif()
 endif(BUILD_SERVER)
 
 # Blacklisted locales that don't work.
 # see issue #4638
 set(GETTEXT_BLACKLISTED_LOCALES
-       be
+       ar
+       dv
        he
-       ko
-       ky
+       hi
+       kn
+       ms_Arab
+       th
 )
 
-option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)
+option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid known broken locales" TRUE)
 
 if (GETTEXTLIB_FOUND AND APPLY_LOCALE_BLACKLIST)
        set(GETTEXT_USED_LOCALES "")
        foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
-               if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")
+               if (NOT "${LOCALE}" IN_LIST GETTEXT_BLACKLISTED_LOCALES)
                        list(APPEND GETTEXT_USED_LOCALES ${LOCALE})
                endif()
        endforeach()
        message(STATUS "Locale blacklist applied; Locales used: ${GETTEXT_USED_LOCALES}")
+elseif (GETTEXTLIB_FOUND)
+       set(GETTEXT_USED_LOCALES ${GETTEXT_AVAILABLE_LOCALES})
 endif()
 
 # Set some optimizations and tweaks
 
 include(CheckCSourceCompiles)
+include(CheckSymbolExists)
+
+set(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR})
+if(USE_LUAJIT)
+       set(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARY})
+       # LuaJIT provides exactly zero ways to determine how recent it is (the version
+       # is unchanged since 2017), however it happens that string buffers were added
+       # after the changes which we care about so that works as an indicator.
+       # (https://github.com/LuaJIT/LuaJIT/commit/4c6b669 March 2021)
+       unset(HAVE_RECENT_LJ CACHE)
+       check_symbol_exists(luaopen_string_buffer "lualib.h" HAVE_RECENT_LJ)
+       if(NOT HAVE_RECENT_LJ)
+               string(CONCAT explanation_msg
+                       "You are using a relatively old version of LuaJIT. We recommend "
+                       "running a recent version (from git) as older ones are known not "
+                       "to build/work correctly in all cases.\n"
+                       "THIS APPLIES ESPECIALLY ON macOS OR Linux/aarch64!")
+               message(WARNING ${explanation_msg})
+       endif()
+else()
+       set(CMAKE_REQUIRED_LIBRARIES "")
+       unset(HAVE_ATCCALL CACHE)
+       # Note: we need to check the function without having the library
+       #       available for linking, so check_symbol_exists won't work.
+       check_c_source_compiles("#include <lua.h>\nint main(){return sizeof(lua_atccall);}" HAVE_ATCCALL)
+       if(NOT HAVE_ATCCALL)
+               string(CONCAT explanation_msg
+                       "It looks like you're trying to build Minetest using a system-wide "
+                       "Lua installation. This is no longer supported because PUC Lua "
+                       "cannot interoperate with C++ correctly. Read src/unittest/test_lua.cpp "
+                       " for technical details.")
+               message(FATAL_ERROR ${explanation_msg})
+       endif()
+endif()
 
 if(MSVC)
        # Visual Studio
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D WIN32_LEAN_AND_MEAN /MP")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D WIN32_LEAN_AND_MEAN")
        # EHa enables SEH exceptions (used for catching segfaults)
-       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MD /GS- /Zi /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
+       set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /MD /GS- /Zi /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0")
        if(CMAKE_SIZEOF_VOID_P EQUAL 4)
                set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:SSE")
        endif()
-       
-       if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-               set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF")
-       else()
-               set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF")
-       endif()
-
-       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
 
+       set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/INCREMENTAL:NO /DEBUG /OPT:REF /OPT:ICF /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
 
        set(CMAKE_CXX_FLAGS_SEMIDEBUG "/MDd /Zi /Ob0 /O1 /RTC1")
 
@@ -721,28 +726,28 @@ if(MSVC)
        # Flags for C files (sqlite)
        # /MD = dynamically link to MSVCRxxx.dll
        set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MD")
+
+       # Flags that cannot be shared between cl and clang-cl
+       # https://clang.llvm.org/docs/UsersManual.html#clang-cl
+       if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld")
+
+               # Disable pragma-pack warning
+               set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-pragma-pack")
+       else()
+               set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+               set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /TP /FD /GL")
+               set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
+       endif()
 else()
        # GCC or compatible compilers such as Clang
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+       set(WARNING_FLAGS "-Wall -Wextra")
+       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-parameter -Wno-implicit-fallthrough")
        if(WARN_ALL)
-               set(RELEASE_WARNING_FLAGS "-Wall")
+               set(RELEASE_WARNING_FLAGS "${WARNING_FLAGS}")
        else()
                set(RELEASE_WARNING_FLAGS "")
        endif()
-       if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-               set(WARNING_FLAGS "${WARNING_FLAGS} -Wsign-compare")
-       endif()
-
-       if(APPLE AND USE_LUAJIT)
-               # required per http://luajit.org/install.html
-               SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
-       elseif(UNIX AND USE_LUAJIT)
-               check_c_source_compiles("#ifndef __aarch64__\n#error\n#endif\nint main(){}" IS_AARCH64)
-               if(IS_AARCH64)
-                       # Move text segment below LuaJIT's 47-bit limit (see issue #9367)
-                       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Ttext-segment=0x200000000")
-               endif()
-       endif()
 
        if(MINGW)
                set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
@@ -751,10 +756,20 @@ else()
 
        # Use a safe subset of flags to speed up math calculations:
        # - we don't need errno or math exceptions
-       # - we don't deal with Inf/NaN or signed zero
-       set(MATH_FLAGS "-fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signed-zeros")
+       # - we don't deal with signed zero
+       set(MATH_FLAGS "-fno-math-errno -fno-trapping-math -fno-signed-zeros")
+
+       # Enable SSE for floating point math on 32-bit x86 by default
+       # reasoning see minetest issue #11810 and https://gcc.gnu.org/wiki/FloatingPointMath
+       if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+               check_c_source_compiles("#ifndef __i686__\n#error\n#endif\nint main(){}" IS_I686)
+               if(IS_I686)
+                       message(STATUS "Detected Intel x86: using SSE instead of x87 FPU")
+                       set(OTHER_FLAGS "${OTHER_FLAGS} -mfpmath=sse -msse")
+               endif()
+       endif()
 
-       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
+       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS} -pipe -funroll-loops")
        if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
                set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
        else()
@@ -766,10 +781,15 @@ else()
                else()
                        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MATH_FLAGS}")
                endif()
-       endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
-       set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
-       set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
+       endif()
+       set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g")
+       set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 ${WARNING_FLAGS} ${OTHER_FLAGS}")
+       set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 ${WARNING_FLAGS} ${OTHER_FLAGS}")
 
+       if(UNIX)
+               # enable assertions for libstdc++ or libc++
+               set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wp,-D_GLIBCXX_ASSERTIONS -Wp,-D_LIBCPP_ENABLE_ASSERTIONS=1")
+       endif()
        if(USE_GPROF)
                set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
        endif()
@@ -783,6 +803,9 @@ endif()
 # Installation
 
 if(WIN32)
+       if(EXTRA_DLL)
+               install(FILES ${EXTRA_DLL} DESTINATION ${BINDIR})
+       endif()
        if(VCPKG_APPLOCAL_DEPS)
                # Collect the dll's from the output path
                install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Release/
@@ -803,7 +826,7 @@ if(WIN32)
                                FILES_MATCHING PATTERN "*.dll")
        else()
                # Use the old-style way to install dll's
-               if(USE_SOUND)
+               if(BUILD_CLIENT AND USE_SOUND)
                        if(OPENAL_DLL)
                                install(FILES ${OPENAL_DLL} DESTINATION ${BINDIR})
                        endif()
@@ -813,9 +836,6 @@ if(WIN32)
                        if(VORBIS_DLL)
                                install(FILES ${VORBIS_DLL} DESTINATION ${BINDIR})
                        endif()
-                       if(VORBISFILE_DLL)
-                               install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR})
-                       endif()
                endif()
                if(CURL_DLL)
                        install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
@@ -823,7 +843,10 @@ if(WIN32)
                if(ZLIB_DLL)
                        install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
                endif()
-               if(FREETYPE_DLL)
+               if(ZSTD_DLL)
+                       install(FILES ${ZSTD_DLL} DESTINATION ${BINDIR})
+               endif()
+               if(BUILD_CLIENT AND FREETYPE_DLL)
                        install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
                endif()
                if(SQLITE3_DLL)
@@ -835,6 +858,13 @@ if(WIN32)
                if(LUA_DLL)
                        install(FILES ${LUA_DLL} DESTINATION ${BINDIR})
                endif()
+               if(BUILD_CLIENT AND USE_GETTEXT AND GETTEXT_DLL)
+                       install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
+               endif()
+       endif()
+
+       if(BUILD_CLIENT AND IRRLICHT_DLL)
+               install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
        endif()
 endif()
 
@@ -862,29 +892,8 @@ 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(NOT VCPKG_APPLOCAL_DEPS)
-                       if(DEFINED IRRLICHT_DLL)
-                               install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
-                       endif()
-                       if(USE_GETTEXT)
-                               if(DEFINED GETTEXT_DLL)
-                                       install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
-                               endif()
-                               if(DEFINED GETTEXT_ICONV_DLL)
-                                       install(FILES ${GETTEXT_ICONV_DLL} DESTINATION ${BINDIR})
-                               endif()
-                       endif()
-               endif()
-       endif()
+       install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
+                       FILES_MATCHING PATTERN "*.ttf" PATTERN "*.txt")
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)