increase stability (#774)

* synchronize x11 access
* allow to use snmalloc instead of system allocator

CMakeLists.txt

@@ -9,13 +9,6 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(IS_64BIT TRUE)
 endif()
 
-#if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
-#    set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -m32")
-#    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
-#    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-#    set(CMAKE_CXX_COMPILER_TARGET "i686-linux-gnu")
-#endif()
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delete-null-pointer-checks")
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -27,14 +20,19 @@ set(IS_ARMHF_BUILD FALSE)
 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
     set(IS_ARM_BUILD TRUE)
     set(IS_ARMHF_BUILD TRUE)
+elseif(BUILD_X86)
+    set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -m32")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+    if(APPLE)
+        set(CMAKE_LIBRARY_ARCHITECTURE "i386-apple-darwin")
+        set(CMAKE_CXX_COMPILER_TARGET "i686-apple-darwin")
+    else()
+        set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
+        set(CMAKE_CXX_COMPILER_TARGET "i686-linux-gnu")
+    endif()
 endif()
 
-# if(APPLE)
-#     set(CMAKE_LIBRARY_ARCHITECTURE "i386-apple-darwin")
-# elseif(NOT IS_ARM_BUILD)
-#     set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
-# endif()
-
 set(DEB_OS_NAME "none" CACHE STRING "Specifies the target OS for building the debs (ubuntu-xenial, ubuntu-bionic, ubuntu-disco)")
 mark_as_advanced(DEB_OS_NAME)
 
@@ -84,7 +82,13 @@ if (USE_GAMECONTROLLERDB AND BUILD_CLIENT)
     include(ext/gamepad_mappings.cmake)
 endif()
 
+option(USE_SNMALLOC "Use the snmalloc allocator" OFF)
+
 if (BUILD_CLIENT)
+    if (USE_SNMALLOC)
+        include(ext/snmalloc.cmake)
+    endif()
+
     include(game-window/BuildSettings.cmake)
     if (GAMEWINDOW_SYSTEM STREQUAL "EGLUT")
         add_subdirectory(eglut)

ext/curl.cmake

@@ -14,9 +14,9 @@ endif()
 
 ExternalProject_Add(
         curl_ext
-        URL "http://curl.haxx.se/download/curl-7.72.0.tar.gz"
+        URL "http://curl.haxx.se/download/curl-7.87.0.tar.gz"
         INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/curl
-        CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/curl" "-DBUILD_CURL_EXE=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DCURL_STATICLIB=ON" "-DCURL_DISABLE_LDAP=ON" "-DCMAKE_USE_LIBSSH2=OFF" "-DCMAKE_USE_OPENLDAP=OFF" "-DCMAKE_C_FLAGS=-m32" "-DCMAKE_LINK_FLAGS=-m32" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}" ${CURL_EXT_EXTRA_OPTIONS}
+        CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/curl" "-DBUILD_CURL_EXE=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DCURL_STATICLIB=ON" "-DCURL_DISABLE_LDAP=ON" "-DCMAKE_USE_LIBSSH2=OFF" "-DCMAKE_USE_OPENLDAP=OFF" "-DUSE_LIBIDN2=OFF" "-DENABLE_WEBSOCKETS=ON" "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}" "-DCMAKE_LINK_FLAGS=${CMAKE_LINK_FLAGS}" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}" ${CURL_EXT_EXTRA_OPTIONS}
 )
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/ext/curl/include/)
 add_library(curl STATIC IMPORTED)

ext/snmalloc.cmake

@@ -0,0 +1,15 @@
+include(FetchContent)
+
+set(SNMALLOC_HEADER_ONLY_LIBRARY ON)
+set(SNMALLOC_USE_CXX17 ON)
+
+FetchContent_Declare(
+        snmalloc_ext
+        URL "https://github.com/microsoft/snmalloc/archive/refs/tags/0.6.1.zip"
+)
+
+FetchContent_GetProperties(snmalloc_ext)
+if(NOT snmalloc_ext_POPULATED)
+  FetchContent_Populate(snmalloc_ext)
+  add_subdirectory(${snmalloc_ext_SOURCE_DIR} ${snmalloc_ext_BINARY_DIR})
+endif()