Joystick: Remap joystick-specific KeyTypes to generic ones

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b416faaf304c166a90eeb5b1afa709ca55d1df7d..b5d4fae0e60fa69ec4e58ab99c6608b8565dd76c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ set(USE_GETTEXT FALSE)
 
 if(ENABLE_GETTEXT)
        find_package(GettextLib)
-       if(GETTEXT_FOUND)
+       if(GETTEXTLIB_FOUND)
                if(WIN32)
                        message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
                        message(STATUS "GetText DLL: ${GETTEXT_DLL}")
@@ -70,7 +70,7 @@ if(ENABLE_GETTEXT)
                endif()
                set(USE_GETTEXT TRUE)
                message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
-       endif(GETTEXT_FOUND)
+       endif(GETTEXTLIB_FOUND)
 else()
        mark_as_advanced(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
        message(STATUS "GetText disabled.")
@@ -217,6 +217,26 @@ endif(ENABLE_REDIS)
 
 find_package(SQLite3 REQUIRED)
 
+OPTION(ENABLE_PROMETHEUS "Enable prometheus client support" FALSE)
+set(USE_PROMETHEUS FALSE)
+
+if(ENABLE_PROMETHEUS)
+       find_path(PROMETHEUS_CPP_INCLUDE_DIR NAMES prometheus/counter.h)
+       find_library(PROMETHEUS_PULL_LIBRARY NAMES prometheus-cpp-pull)
+       find_library(PROMETHEUS_CORE_LIBRARY NAMES prometheus-cpp-core)
+       if(PROMETHEUS_CPP_INCLUDE_DIR AND PROMETHEUS_PULL_LIBRARY AND PROMETHEUS_CORE_LIBRARY)
+               set(PROMETHEUS_LIBRARIES ${PROMETHEUS_PULL_LIBRARY} ${PROMETHEUS_CORE_LIBRARY})
+               set(USE_PROMETHEUS TRUE)
+               include_directories(${PROMETHEUS_CPP_INCLUDE_DIR})
+       endif(PROMETHEUS_CPP_INCLUDE_DIR AND PROMETHEUS_PULL_LIBRARY AND PROMETHEUS_CORE_LIBRARY)
+endif(ENABLE_PROMETHEUS)
+
+if(USE_PROMETHEUS)
+       message(STATUS "Prometheus client enabled.")
+else(USE_PROMETHEUS)
+       message(STATUS "Prometheus client disabled.")
+endif(USE_PROMETHEUS)
+
 OPTION(ENABLE_SPATIAL "Enable SpatialIndex AreaStore backend" TRUE)
 set(USE_SPATIAL FALSE)
 
@@ -331,6 +351,10 @@ else()
        if (ICONV_LIBRARY)
                set(PLATFORM_LIBS ${PLATFORM_LIBS} ${ICONV_LIBRARY})
        endif()
+       if (HAIKU)
+               set(PLATFORM_LIBS ${PLATFORM_LIBS} intl network)
+       endif()
+
 endif()
 
 check_include_files(endian.h HAVE_ENDIAN_H)
@@ -407,6 +431,7 @@ set(common_SRCS
        noise.cpp
        objdef.cpp
        object_properties.cpp
+       particles.cpp
        pathfinder.cpp
        player.cpp
        porting.cpp
@@ -597,6 +622,9 @@ if(BUILD_CLIENT)
        if (USE_REDIS)
                target_link_libraries(${PROJECT_NAME} ${REDIS_LIBRARY})
        endif()
+       if (USE_PROMETHEUS)
+               target_link_libraries(${PROJECT_NAME} ${PROMETHEUS_LIBRARIES})
+       endif()
        if (USE_SPATIAL)
                target_link_libraries(${PROJECT_NAME} ${SPATIAL_LIBRARY})
        endif()
@@ -632,6 +660,9 @@ if(BUILD_SERVER)
        if (USE_REDIS)
                target_link_libraries(${PROJECT_NAME}server ${REDIS_LIBRARY})
        endif()
+       if (USE_PROMETHEUS)
+               target_link_libraries(${PROJECT_NAME}server ${PROMETHEUS_LIBRARIES})
+       endif()
        if (USE_SPATIAL)
                target_link_libraries(${PROJECT_NAME}server ${SPATIAL_LIBRARY})
        endif()
@@ -654,7 +685,7 @@ set(GETTEXT_BLACKLISTED_LOCALES
 
 option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)
 
-if (GETTEXT_FOUND AND APPLY_LOCALE_BLACKLIST)
+if (GETTEXTLIB_FOUND AND APPLY_LOCALE_BLACKLIST)
        set(GETTEXT_USED_LOCALES "")
        foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
                if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")
@@ -670,21 +701,14 @@ include(CheckCSourceCompiles)
 
 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")
 
@@ -695,6 +719,19 @@ 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 MATCHES "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")