Merge branch 'native' into dev_copy

vmangos · Dec 31, 2024 · dfead75 · dfead75
2 parents f26cadf + 9e3f0e1
commit dfead75
Show file tree

Hide file tree

Showing 254 changed files with 22,132 additions and 5,086 deletions.
diff --git a/.drone.yml b/.drone.yml
diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
@@ -11,7 +11,6 @@ on:
       - '.github/workflows/db_check.yml'
       - '.github/workflows/db_dump.yml'
       - 'sql/**'
-      - '.drone.yml'
       - 'README.md'
       - 'LICENSE'
       - '.gitignore'
@@ -26,23 +25,13 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: windows dependencies
-      #Sets versions for ACE/TBB
+      #Sets versions for TBB
       env:
-        ACE_VERSION: 6.5.11
-        ACE_VERSION2: 6_5_11
         TBB_VERSION: 2020.3
 
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
+        # Setup TBB
         export TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb
-        #ACE package download
-        curl -LOJ http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-$ACE_VERSION2/ACE-$ACE_VERSION.zip
-        unzip ACE-$ACE_VERSION.zip
-        rm ACE-$ACE_VERSION.zip
-        #configuration of ACE header
-        echo "#include \"ace/config-win32.h\"" >> $ACE_ROOT/ace/config.h
-        #TBB package download
         curl -LOJ https://github.com/oneapi-src/oneTBB/releases/download/v$TBB_VERSION/tbb-$TBB_VERSION-win.zip
         unzip tbb-$TBB_VERSION-win.zip
         rm tbb-$TBB_VERSION-win.zip
@@ -52,11 +41,7 @@ jobs:
     #build and install
     - name: windows build & install
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
-        cd $GITHUB_WORKSPACE/ACE_wrappers
-        /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe "ACE_wrappers_vs2019.sln" //p:Configuration=Release //p:Platform=x64 //t:ACE //m:2
-        cd $GITHUB_WORKSPACE
+        # Setup TBB
         mkdir build
         cd build
         cmake -D TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb -DWITH_WARNINGS=0 -DBUILD_FOR_HOST_CPU=0 -DUSE_EXTRACTORS=1 -G "Visual Studio 16 2019" -A x64 ..
@@ -79,7 +64,6 @@ jobs:
           copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc_proxy.dll ${{github.workspace}}/bin/Release/tbbmalloc_proxy.dll
           copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc_proxy_debug.dll ${{github.workspace}}/bin/Release/tbbmalloc_proxy_debug.dll
 
-          copy ${{github.workspace}}/ACE_wrappers/lib/ACE.dll ${{github.workspace}}/bin/Release/ACE.dll
           copy ${{github.workspace}}/dep/windows/lib/x64_release/libmySQL.dll ${{github.workspace}}/bin/Release/libmySQL.dll
           # copy "c:/Program Files/OpenSSL-Win64/bin/libssl-1_1-x64.dll" ${{github.workspace}}/bin/Release/libssl-1_1-x64.dll
           # copy "c:/Program Files/OpenSSL-Win64/bin/libcrypto-1_1-x64.dll" ${{github.workspace}}/bin/Release/libcrypto-1_1-x64.dll

diff --git a/.github/workflows/vmangos.yml b/.github/workflows/vmangos.yml
@@ -15,7 +15,6 @@ on:
       - '.github/workflows/db_check.yml'
       - '.github/workflows/db_dump.yml'
       - 'sql/**'
-      - '.drone.yml'
       - 'README.md'
       - 'LICENSE'
       - '.gitignore'
@@ -29,7 +28,6 @@ on:
       - '.github/workflows/db_check.yml'
       - '.github/workflows/db_dump.yml'
       - 'sql/**'
-      - '.drone.yml'
       - 'README.md'
       - 'LICENSE'
       - '.gitignore'
@@ -57,27 +55,17 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get -qq update
-        sudo apt-get -qq install build-essential cmake libace-dev libmysql++-dev libtbb-dev libcurl4-openssl-dev openssl
+        sudo apt-get -qq install build-essential cmake libmysql++-dev libtbb-dev libcurl4-openssl-dev openssl
       #windows dependencies
     - name: windows dependencies
       if: matrix.os == 'windows-2019'
-      #Sets versions for ACE/TBB
+      #Sets versions TBB
       env:
-        ACE_VERSION: 6.5.11
-        ACE_VERSION2: 6_5_11
         TBB_VERSION: 2020.3
 
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
+        # Setup TBB
         export TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb
-        #ACE package download
-        curl -LOJ http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-$ACE_VERSION2/ACE-$ACE_VERSION.zip
-        unzip ACE-$ACE_VERSION.zip
-        rm ACE-$ACE_VERSION.zip
-        #configuration of ACE header
-        echo "#include \"ace/config-win32.h\"" >> $ACE_ROOT/ace/config.h
-        #TBB package download
         curl -LOJ https://github.com/oneapi-src/oneTBB/releases/download/v$TBB_VERSION/tbb-$TBB_VERSION-win.zip
         unzip tbb-$TBB_VERSION-win.zip
         rm tbb-$TBB_VERSION-win.zip
@@ -99,10 +87,6 @@ jobs:
     - name: windows build & install
       if: matrix.os == 'windows-2019'
       run: |
-        # Build ACE
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
-        cd $GITHUB_WORKSPACE/ACE_wrappers
-        /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe "ACE_wrappers_vs2019.sln" //p:Configuration=Release //p:Platform=x64 //t:ACE //m:2
         # Build CURL
         cd $GITHUB_WORKSPACE/dep/windows/optional_dependencies/
         ./curl_download_and_build.bat

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.1...3.20)
 
 project(MaNGOS)
 
-# Allow -DACE_ROOT, -DTBB_ROOT, etc.
+# Allow -DTBB_ROOT, etc.
 if(${CMAKE_VERSION} VERSION_GREATER "3.11")
   cmake_policy(SET CMP0074 NEW)
 endif()
@@ -83,19 +83,6 @@ set(CMAKE_INSTALL_RPATH ${LIBS_DIR})
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
 
 # Find needed packages and if necessery abort if something important is missing
-unset(ACE_INCLUDE_DIR CACHE)
-unset(ACE_LIBRARIES CACHE)
-unset(ACE_LIBRARIES_DIR CACHE)
-unset(ACE_INCLUDE_DIR)
-unset(ACE_LIBRARIES)
-unset(ACE_LIBRARIES_DIR)
-
-find_package(ACE)
-if(NOT ACE_FOUND)
-  message(FATAL_ERROR
-    "This project requires ACE installed. Please download the ACE Micro Release Kit from http://download.dre.vanderbilt.edu/ and install it. If this script didn't find ACE and it was correctly installed please set ACE_ROOT to the correct path."
-  )
-endif()
 
 if(NOT USE_STD_MALLOC)
   unset(TBB_INCLUDE_DIRS            CACHE)

diff --git a/cmake/find/FindACE.cmake b/cmake/find/FindACE.cmake
diff --git a/contrib/mmap/src/MMapCommon.h b/contrib/mmap/src/MMapCommon.h
@@ -19,11 +19,6 @@
 #ifndef _MMAP_COMMON_H
 #define _MMAP_COMMON_H
 
-// stop warning spam from ACE includes
-#ifdef _WIN32
-#  pragma warning( disable : 4996 )
-#endif
-
 #include <string>
 #include <vector>
 

diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
@@ -24,6 +24,7 @@
 #include "Maps/GridMapDefines.h"
 #include "DetourNavMeshBuilder.h"
 #include "DetourCommon.h"
+#include <climits>
 
 using namespace VMAP;
 

diff --git a/contrib/mmap/src/MapBuilder.h b/contrib/mmap/src/MapBuilder.h
@@ -30,7 +30,6 @@
 #include "TileWorker.h"
 
 using namespace VMAP;
-// G3D namespace typedefs conflicts with ACE typedefs
 
 using json = nlohmann::json;
 

diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
@@ -21,3 +21,12 @@ add_subdirectory(gsoap)
 if (USE_EXTRACTORS)
 	add_subdirectory(libmpq)
 endif()
+
+add_subdirectory(cpptrace)
+set_target_properties(cpptrace-lib PROPERTIES FOLDER "3rd Party")
+get_cmake_property(variables CACHE_VARIABLES) # hide "CPPTRACE_*" variables in default cmake config
+foreach(variable ${variables})
+	if(variable MATCHES "^CPPTRACE_")
+		mark_as_advanced(${variable})
+	endif()
+endforeach()