Rochet2 · Rochet2 · May 26, 2026 · Mar 21, 2026 · Mar 21, 2026 · Mar 21, 2026
diff --git a/.github/workflows/win-x64-build.yml b/.github/workflows/win-x64-build.yml
@@ -84,10 +84,10 @@ jobs:
       run: |
         cd ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}
         copy "${{ env.MYSQL_ROOT_DIR }}/lib/libmysql.dll" libmysql.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/libssl-3-x64.dll" libssl-3-x64.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/libcrypto-3-x64.dll" libcrypto-3-x64.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/legacy.dll" legacy.dll
-      
+        # mysql may depend on a different version of openssl so copy its dlls first (override later with openssl's own if same version)
+        Copy-Item -Path "${{ env.MYSQL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl* -Destination .
+        Copy-Item -Path "${{ env.OPENSSL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl*,legacy* -Destination .
+
     - name: Check binaries
       run: |
         cd ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}

diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
@@ -48,7 +48,7 @@ if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
   target_compile_options(trinity-compile-option-interface
     INTERFACE
       /MP)
-else()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   # Forces writes to the PDB file to be serialized through mspdbsrv.exe (/FS)
   # Enable faster PDB generation in parallel builds by minimizing RPC calls to mspdbsrv.exe (/Zf)
   target_compile_options(trinity-compile-option-interface

diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake
@@ -134,7 +134,7 @@ if(WIN32)
 	OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   # Remove "Microsoft Windows" from the result
-  string(REGEX REPLACE "^.* Windows " "" TRINITY_BUILD_HOST_SYSTEM_RELEASE ${TRINITY_BUILD_HOST_SYSTEM_RELEASE})
+  string(REGEX REPLACE "^.* Windows " "" TRINITY_BUILD_HOST_SYSTEM_RELEASE "${TRINITY_BUILD_HOST_SYSTEM_RELEASE}")
 endif()
 
 if(CMAKE_SCRIPT_MODE_FILE)

diff --git a/dep/PackageList.txt b/dep/PackageList.txt
@@ -18,7 +18,7 @@ G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
 
 jemalloc (a general-purpose scalable concurrent malloc-implementation)
   https://github.com/jemalloc/jemalloc
-  Version: 5.3.0
+  Version: 5.3.1
 
 libreadline (command line editing library)
   https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -42,7 +42,7 @@ zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
 
 gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
   http://gsoap2.sourceforge.net/
-  Version: 2.8.117
+  Version: 2.8.141
 
 recastnavigation (Recast is state of the art navigation mesh construction toolset for games)
   https://github.com/recastnavigation/recastnavigation

diff --git a/dep/g3dlite/G3D-v9.0 hotfix20.diff b/dep/g3dlite/G3D-v9.0 hotfix20.diff
@@ -0,0 +1,87 @@
+diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
+index 9202fe41d0..400a81361e 100644
+--- a/dep/g3dlite/include/G3D/platform.h
++++ b/dep/g3dlite/include/G3D/platform.h
+@@ -52,8 +52,10 @@ These control the version of Winsock used by G3D.
+
+ #ifndef _MSC_VER
+ /// Fast call is a register-based optimized calling convention supported only by Visual C++
++#ifndef __fastcall
+ #define __fastcall
+ #endif
++#endif
+
+ /** \def G3D_WINDOWS*/
+ /** \def G3D_FREEBSD2*/
+@@ -64,8 +66,10 @@ These control the version of Winsock used by G3D.
+ #   define G3D_WINDOWS
+ #elif defined(__MINGW32__)
+     #define G3D_WINDOWS
+-    #undef __MSVCRT_VERSION__
+-    #define __MSVCRT_VERSION__ 0x0601
++    #if !defined(__MSVCRT_VERSION__) || __MSVCRT_VERSION__ < 0x0601
++        #undef __MSVCRT_VERSION__
++        #define __MSVCRT_VERSION__ 0x0601
++    #endif
+     #include <windows.h>
+ #elif  defined(__FreeBSD__) || defined(__OpenBSD__)
+     #define G3D_FREEBSD
+diff --git a/dep/g3dlite/source/GThread.cpp b/dep/g3dlite/source/GThread.cpp
+index 5f3f7ffd64..f6483a75d1 100644
+--- a/dep/g3dlite/source/GThread.cpp
++++ b/dep/g3dlite/source/GThread.cpp
+@@ -91,6 +91,11 @@ typedef struct tagTHREADNAME_INFO {
+ } THREADNAME_INFO;
+ #pragma pack(pop)
+
++static LONG ExceptionIgnorer(PEXCEPTION_POINTERS ex)
++{
++   return ex->ExceptionRecord->ExceptionCode == MS_VC_EXCEPTION ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH;
++}
++
+ static void SetThreadName(DWORD dwThreadID, const char* threadName) {
+    THREADNAME_INFO info;
+    info.dwType = 0x1000;
+@@ -98,9 +103,9 @@ static void SetThreadName(DWORD dwThreadID, const char* threadName) {
+    info.dwThreadID = dwThreadID;
+    info.dwFlags = 0;
+
+-   __try {
+-      RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info );
+-   } __except(EXCEPTION_EXECUTE_HANDLER) {}
++   PVOID handler = AddVectoredExceptionHandler(1, &ExceptionIgnorer);
++   RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info );
++   RemoveVectoredExceptionHandler(handler);
+ }
+ #endif
+
+diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
+index d6fbfa7567..213cec86d8 100644
+--- a/dep/g3dlite/source/System.cpp
++++ b/dep/g3dlite/source/System.cpp
+@@ -42,6 +42,7 @@
+ #ifdef G3D_WINDOWS
+
+ #   include <conio.h>
++#   include <crtdbg.h>
+ #   include <sys/timeb.h>
+ #   include "G3D/RegistryUtil.h"
+ #include <Ole2.h>
+@@ -1725,7 +1726,7 @@ void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, ui
+ #if ! defined(__PIC__) || defined(__x86_64__)
+     // AT&T assembler syntax
+     asm volatile(
+-                 "movl $0, %%ecx   \n\n" /* Wipe ecx */
++                 "xor %%ecx, %%ecx \n\n" /* Wipe ecx */
+                  "cpuid            \n\t"
+                  : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
+                  : "a"(func));
+@@ -1733,7 +1734,7 @@ void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, ui
+     // AT&T assembler syntax
+     asm volatile(
+                  "pushl %%ebx      \n\t" /* save ebx */
+-                 "movl $0, %%ecx   \n\n" /* Wipe ecx */
++                 "xor %%ecx, %%ecx \n\n" /* Wipe ecx */
+                  "cpuid            \n\t"
+                  "movl %%ebx, %1   \n\t" /* save what cpuid just put in %ebx */
+                  "popl %%ebx       \n\t" /* restore the old ebx */
diff --git a/dep/g3dlite/G3D-v9.0 hotfix21.diff b/dep/g3dlite/G3D-v9.0 hotfix21.diff
@@ -0,0 +1,35 @@
+diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
+index 400a81361e..a38e87a641 100644
+--- a/dep/g3dlite/include/G3D/platform.h
++++ b/dep/g3dlite/include/G3D/platform.h
+@@ -366,29 +366,14 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
+
+
+ // Bring in shared_ptr and weak_ptr
+-#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__linux__)
+-#include <ciso646> // Defines _LIBCC_VERSION if linking against libc++ or does nothing
+-#endif
+-#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__))
+-#   include <tr1/memory>
+-#else
+-#   include <memory>
+-#endif
++#include <memory>
+
+ namespace G3D {
+-#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__))
+-    using std::tr1::shared_ptr;
+-    using std::tr1::weak_ptr;
+-    using std::tr1::dynamic_pointer_cast;
+-    using std::tr1::static_pointer_cast;
+-    using std::tr1::enable_shared_from_this;
+-#else
+     using std::shared_ptr;
+     using std::weak_ptr;
+     using std::dynamic_pointer_cast;
+     using std::static_pointer_cast;
+     using std::enable_shared_from_this;
+-#endif
+
+     /** Options for initG3D and initGLG3D. */
+     class G3DSpecification {
diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt
@@ -29,3 +29,5 @@ G3D-v9.0 hotfix16.diff - 2022-02-11 - Fix *BSD compile errors
 G3D-v9.0 hotfix17.diff - 2023-03-25 - Fix macOS compile errors
 G3D-v9.0 hotfix18.diff - 2024-02-17 - ARM64 support on MSVC
 G3D-v9.0 hotfix19.diff - 2024-06-09 - clang build fix on windows
+G3D-v9.0 hotfix20.diff - 2026-05-07 - gcc build fix on windows
+G3D-v9.0 hotfix21.diff - 2026-05-07 - gcc 16 warning fix
diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
@@ -52,8 +52,10 @@ These control the version of Winsock used by G3D.
 
 #ifndef _MSC_VER
 /// Fast call is a register-based optimized calling convention supported only by Visual C++
+#ifndef __fastcall
 #define __fastcall
 #endif
+#endif
 
 /** \def G3D_WINDOWS*/
 /** \def G3D_FREEBSD2*/
@@ -64,8 +66,10 @@ These control the version of Winsock used by G3D.
 #   define G3D_WINDOWS
 #elif defined(__MINGW32__)
     #define G3D_WINDOWS
-    #undef __MSVCRT_VERSION__
-    #define __MSVCRT_VERSION__ 0x0601
+    #if !defined(__MSVCRT_VERSION__) || __MSVCRT_VERSION__ < 0x0601
+        #undef __MSVCRT_VERSION__
+        #define __MSVCRT_VERSION__ 0x0601
+    #endif
     #include <windows.h>
 #elif  defined(__FreeBSD__) || defined(__OpenBSD__)
     #define G3D_FREEBSD
@@ -362,29 +366,14 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) {\
 
 
 // Bring in shared_ptr and weak_ptr
-#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__linux__)
-#include <ciso646> // Defines _LIBCC_VERSION if linking against libc++ or does nothing
-#endif
-#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__))
-#   include <tr1/memory>
-#else
-#   include <memory>
-#endif
+#include <memory>
 
 namespace G3D {
-#if (!defined(_LIBCPP_VERSION) && defined(__APPLE__)) || (!defined(_LIBCPP_VERSION) && defined(__linux__))
-    using std::tr1::shared_ptr;
-    using std::tr1::weak_ptr;
-    using std::tr1::dynamic_pointer_cast;
-    using std::tr1::static_pointer_cast;
-    using std::tr1::enable_shared_from_this;
-#else
     using std::shared_ptr;
     using std::weak_ptr;
     using std::dynamic_pointer_cast;
     using std::static_pointer_cast;
     using std::enable_shared_from_this;
-#endif
 
     /** Options for initG3D and initGLG3D. */
     class G3DSpecification {

diff --git a/dep/g3dlite/source/GThread.cpp b/dep/g3dlite/source/GThread.cpp
@@ -91,16 +91,21 @@ typedef struct tagTHREADNAME_INFO {
 } THREADNAME_INFO;
 #pragma pack(pop)
 
+static LONG ExceptionIgnorer(PEXCEPTION_POINTERS ex)
+{
+   return ex->ExceptionRecord->ExceptionCode == MS_VC_EXCEPTION ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH;
+}
+
 static void SetThreadName(DWORD dwThreadID, const char* threadName) {
    THREADNAME_INFO info;
    info.dwType = 0x1000;
    info.szName = threadName;
    info.dwThreadID = dwThreadID;
    info.dwFlags = 0;
 
-   __try {
-      RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info );
-   } __except(EXCEPTION_EXECUTE_HANDLER) {}
+   PVOID handler = AddVectoredExceptionHandler(1, &ExceptionIgnorer);
+   RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info );
+   RemoveVectoredExceptionHandler(handler);
 }
 #endif
 

diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
@@ -42,6 +42,7 @@
 #ifdef G3D_WINDOWS
 
 #   include <conio.h>
+#   include <crtdbg.h>
 #   include <sys/timeb.h>
 #   include "G3D/RegistryUtil.h"
 #include <Ole2.h>
@@ -1725,15 +1726,15 @@ void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, ui
 #if ! defined(__PIC__) || defined(__x86_64__)
     // AT&T assembler syntax
     asm volatile(
-                 "movl $0, %%ecx   \n\n" /* Wipe ecx */
+                 "xor %%ecx, %%ecx \n\n" /* Wipe ecx */
                  "cpuid            \n\t"
                  : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
                  : "a"(func));
 #else
     // AT&T assembler syntax
     asm volatile(
                  "pushl %%ebx      \n\t" /* save ebx */
-                 "movl $0, %%ecx   \n\n" /* Wipe ecx */
+                 "xor %%ecx, %%ecx \n\n" /* Wipe ecx */
                  "cpuid            \n\t"
                  "movl %%ebx, %1   \n\t" /* save what cpuid just put in %ebx */
                  "popl %%ebx       \n\t" /* restore the old ebx */

diff --git a/dep/gsoap/CMakeLists.txt b/dep/gsoap/CMakeLists.txt
@@ -26,15 +26,9 @@ target_sources(gsoap
 
 set_target_properties(gsoap PROPERTIES LINKER_LANGUAGE CXX)
 
-target_compile_definitions(gsoap
-  PUBLIC
-    WITH_OPENSSL)
-
 target_link_libraries(gsoap
   PRIVATE
-    trinity-dependency-interface
-  PUBLIC
-    openssl)
+    trinity-dependency-interface)
 
 set_target_properties(gsoap
     PROPERTIES