update : opentibiabr/canary@b82568a

// src

.github/workflows/build-ubuntu.yml

@@ -36,26 +36,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
         buildtype: [linux-release]
         include:
           - os: ubuntu-22.04
             triplet: x64-linux
+          - os: ubuntu-24.04
+            triplet: x64-linux
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@main
 
       - name: Install Linux Dependencies
         run: >
-          sudo apt-get update && sudo apt-get install ccache linux-headers-$(uname -r)
+          sudo apt-get update && sudo apt-get install ccache linux-headers-"$(uname -r)"
+
+      - name: Switch to gcc-12 on Ubuntu 22.04
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          sudo apt install gcc-12 g++-12
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
+          sudo update-alternatives --set gcc /usr/bin/gcc-12
 
-      - name: Switch to gcc-11
-        if: matrix.os == 'ubuntu-20.04'
+      - name: Switch to gcc-14 on Ubuntu 24.04
+        if: matrix.os == 'ubuntu-24.04'
         run: |
-          sudo apt install gcc-11 g++-11
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11
-          sudo update-alternatives --set gcc /usr/bin/gcc-11
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+          sudo apt-get update
+          sudo apt-get install gcc-14 g++-14 -y
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 --slave /usr/bin/g++ g++ /usr/bin/g++-14 --slave /usr/bin/gcov gcov /usr/bin/gcov-14
+          sudo update-alternatives --set gcc /usr/bin/gcc-14
 
       - name: CCache
         uses: hendrikmuhs/ccache-action@main
@@ -70,7 +81,7 @@ jobs:
         run: |
           vcpkgCommitId=$(grep '.builtin-baseline' vcpkg.json | awk -F: '{print $2}' | tr -d '," ')
           echo "vcpkg commit ID: $vcpkgCommitId"
-          echo "VCPKG_GIT_COMMIT_ID=$vcpkgCommitId" >> $GITHUB_ENV
+          echo "VCPKG_GIT_COMMIT_ID=$vcpkgCommitId" >> "$GITHUB_ENV"
 
       - name: Get vcpkg commit id from vcpkg.json
         uses: lukka/run-vcpkg@main

CMakeLists.txt

@@ -7,30 +7,31 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 
 # VCPKG
 # cmake -DCMAKE_TOOLCHAIN_FILE=/opt/workspace/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-# Needed libs is in file vcpkg.json
+# Needed libs are in file vcpkg.json
 # Windows required libs: .\vcpkg install --triplet x64-windows asio pugixml spdlog curl protobuf parallel-hashmap magic-enum mio luajit libmariadb mpir abseil bshoshany-thread-pool
+
 if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
-  set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-      CACHE STRING "")
+    set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+            CACHE STRING "")
 endif()
 
 if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
-  set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
+    set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
 endif()
 
 set(VCPKG_FEATURE_FLAGS "versions")
 set(VCPKG_BUILD_TYPE "release")
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # *****************************************************************************
 # Project canary
 # *****************************************************************************
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    project(otxserver-debug)
+    project(otxserver-debug LANGUAGES CXX)
 else()
-    project(otxserver)
+    project(otxserver LANGUAGES CXX)
 endif()
 
-
 # *****************************************************************************
 # Append cmake search path
 # *****************************************************************************
@@ -54,7 +55,7 @@ option(FEATURE_METRICS "Enable metrics feature" OFF)
 # Options Code
 # *****************************************************************************
 
-if(FEATURE_METRIC)
+if(FEATURE_METRICS)
     log_option_enabled("metrics")
 else ()
     log_option_disabled("metrics")
@@ -66,52 +67,21 @@ if(OPTIONS_ENABLE_CCACHE)
     if(CCACHE)
         log_option_enabled("ccache")
         set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
-        else()
+    else()
         log_option_disabled("ccache")
     endif()
 endif()
 
-
 # === SCCACHE ===
 if(OPTIONS_ENABLE_SCCACHE)
-  find_program(SCCACHE_PATH sccache)
-  if(SCCACHE_PATH)
-    log_option_enabled("sccache")
-    set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE_PATH})
-    set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE_PATH})
-  else()
-    log_option_disabled("sccache")
-  endif()
-endif()
-
-
-# === IPO ===
-if(OPTIONS_ENABLE_IPO)
-    if(MSVC)
-        log_option_enabled("IPO/LTO")
-        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL")
-        set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-        set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-        set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-        set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
+    find_program(SCCACHE_PATH sccache)
+    if(SCCACHE_PATH)
+        log_option_enabled("sccache")
+        set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE_PATH})
+        set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE_PATH})
     else()
-        if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release")
-            log_option_enabled("IPO/LTO")
-            include(CheckIPOSupported)
-            check_ipo_supported(RESULT result OUTPUT output)
-            if(result)
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=auto")
-                message(STATUS "IPO/LTO enabled with -flto=auto for non-MSVC compiler.")
-                set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-            else()
-                log_war("IPO/LTO not supported: ${output}")
-            endif()
-        else()
-            log_option_disabled("IPO/LTO")
-        endif ()
+        log_option_disabled("sccache")
     endif()
-else()
-    log_option_disabled("IPO/LTO")
 endif()
 
 option(BUILD_TESTS "Build tests" OFF) # By default, tests will not be built
@@ -122,6 +92,6 @@ option(RUN_TESTS_AFTER_BUILD "Run tests when building" OFF) # By default, tests
 # *****************************************************************************
 add_subdirectory(src)
 
-if(BUILD_TESTS)
+if(BUILD_TESTS OR PACKAGE_TESTS)
     add_subdirectory(tests)
 endif()

CMakePresets.json

@@ -83,9 +83,21 @@
       "description": "Build Debug Mode",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
         "DEBUG_LOG": "ON",
-        "SPEED_UP_BUILD_UNITY": "OFF",
-        "ASAN_ENABLED": "ON"
+        "SPEED_UP_BUILD_UNITY": "OFF"
+      }
+    },
+    {
+      "name": "linux-debug-asan",
+      "inherits": "linux-release",
+      "displayName": "Linux - Debug Build",
+      "description": "Build Debug Mode With ASAN Enable",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "DEBUG_LOG": "ON",
+        "ASAN_ENABLED": "ON",
+        "SPEED_UP_BUILD_UNITY": "OFF"
       }
     },
     {

README.md

@@ -1,3 +1,5 @@
+# The OTX Server - Based on: Canary Server
+
 ## Builds
 [![Build - Ubuntu](https://github.com/mattyx14/otxserver/actions/workflows/build-ubuntu.yml/badge.svg)](https://github.com/mattyx14/otxserver/actions/workflows/build-ubuntu.yml)
 [![Build - Windows](https://github.com/mattyx14/otxserver/actions/workflows/build-windows-cmake.yml/badge.svg)](https://github.com/mattyx14/otxserver/actions/workflows/build-windows-cmake.yml)
@@ -21,23 +23,32 @@ With downloads, support, tutorials, Lua scripts, C++ codes, PHP codes and more .
 * [OTLand](https://otland.net/) - [English]
 * [Tibia Face](https://tibiaface.foroactivo.com/) - [Español]
 
-## Special Thanks OTServBR-Global
-- our partners OTServBR-Global.
-- our crew (majesty, gpedro, eduardo dantas)
-- our testers (raphaellb, petardako, szulcek and olimpotibia)
-- [our contributors](https://github.com/opentibiabr/canary/graphs/contributors)
-- [fear lucien](https://github.com/FearLucien)
-- [cjaker](https://github.com/Eternal-Scripts)
-- [slavidodo](https://github.com/slavidodo)
-- [mignari and our awesome tools](https://github.com/ottools)
-- [saiyansking/optimized_forgottenserver and contributors](https://github.com/SaiyansKing/optimized_forgottenserver)
-- [otland/forgottenserver](https://github.com/otland/forgottenserver) and contributors.
-- if we forget someone, we apologize by forgot you. but you know, **forgot**tenserver.
-
 ## Contacts OTX Server 2:
 - <b>Matty(English & Spanish):</b><br>
 Facebook: https://www.facebook.com/Mattyx14/<br>
 E-mail: [email protected]<br>
 Whatsapp: +523211136700<br><br>
 - <b>Reason(English & Portuguese):</b><br>
 Discord: Reason#2913
+
+## Special Thanks
+
+- Our contributors ([Canary](https://github.com/opentibiabr/canary/graphs/contributors) | [OTServBR-Global](https://github.com/opentibiabr/otservbr-global/graphs/contributors)).
+
+## Sponsors
+
+See our [donate page](https://docs.opentibiabr.com/home/donate).
+
+## Project supported by JetBrains
+
+We extend our heartfelt gratitude to Jetbrains for generously granting us licenses to collaborate on this and various
+other open-source initiatives.
+
+<a href="https://jb.gg/OpenSourceSupport/?from=https://github.com/opentibiabr/canary/">
+  <img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg" alt="JetBrains" width="150" />
+</a>
+
+## Partners
+
+[![Supported by OTServ Brasil](https://raw.githubusercontent.com/otbr/otserv-brasil/main/otbr.png)](https://forums.otserv.com.br)
+