Merge branch 'development' into repacker

coolzoom · Jul 15, 2024 · 15ca837 · 15ca837
2 parents ee815a9 + 3d61a81
commit 15ca837
Show file tree

Hide file tree

Showing 203 changed files with 1,784 additions and 93,213 deletions.
diff --git a/.github/workflows/db_dump.yml b/.github/workflows/db_dump.yml
@@ -3,6 +3,8 @@ name: vmangos Development DB Dump
 
 on:
   push:
+    branches:
+      - development
     paths:
       - '**.sql'
       - '.github/workflows/db_dump.yml'

diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
@@ -2,6 +2,8 @@ name: Windows Development Release
 
 on:
   push:
+    branches:
+      - development
     paths-ignore:
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/ISSUE_TEMPLATE.md'

diff --git a/.github/workflows/vmangos.yml b/.github/workflows/vmangos.yml
@@ -62,7 +62,7 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get -qq update
-        sudo apt-get -qq install build-essential cmake cppcheck git libace-dev libiberty-dev libmysql++-dev libssl-dev libtbb-dev make openssl libreadline-dev
+        sudo apt-get -qq install build-essential cmake cppcheck git libace-dev libiberty-dev libmysql++-dev libssl-dev libtbb-dev make openssl
       #windows dependencies
     - name: windows dependencies
       if: matrix.os == 'windows-2019'

diff --git a/dep/include/g3dlite/G3D/platform.h b/dep/include/g3dlite/G3D/platform.h
@@ -273,7 +273,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
 #           define __stdcall __attribute__((stdcall))
 #       endif
 
-#   elif defined(__x86_64__) || defined(__arm) || defined(__aarch64__)
+#   elif defined(__x86_64__) || defined(__arm) || defined(__arm__) || defined(__aarch64__)
 
 #       ifndef __cdecl
 #           define __cdecl

diff --git a/dep/src/CMakeLists.txt b/dep/src/CMakeLists.txt
@@ -22,6 +22,5 @@ endif()
 add_subdirectory(g3dlite)
 add_subdirectory(gsoap)
 if(WIN32)
-    add_subdirectory(readline)
     add_subdirectory(zlib)
 endif()
diff --git a/dep/src/readline/.gitignore b/dep/src/readline/.gitignore