Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep/g3d: Build fix for clang on windows

Browse Source
This commit is contained in:
Shauren
2024-06-09 14:17:25 +02:00
parent ef70cf6481
commit a649f62a18
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dep/g3dlite/G3D-v9.0 hotfix19.diff Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
index 1c7d913929..d6fbfa7567 100644
--- a/dep/g3dlite/source/System.cpp
+++ b/dep/g3dlite/source/System.cpp
@@ -1695,7 +1695,7 @@ std::string System::currentTimeString() {
// Windows 64-bit
void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, uint32& edx) {
#if !defined(_M_ARM) && !defined(_M_ARM64) && !defined(_M_HYBRID_X86_ARM64) && !defined(_M_ARM64EC)
- int regs[4] = {eax, ebx, ecx, edx};
+ int regs[4] = {(int)eax, (int)ebx, (int)ecx, (int)edx};
__cpuid(regs, func);
#else
int regs[4] = { 0, 0, 0, 0 };

3
dep/g3dlite/Readme.txt
View File

@@ -26,3 +26,6 @@ G3D-v9.0 hotfix13.diff - 2020-08-04 - MSVC build fix with /permissive-
G3D-v9.0 hotfix14.diff - 2022-01-16 - warning fixes
G3D-v9.0 hotfix15.diff - 2022-02-11 - purge Windows.h includes from public headers
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

2
dep/g3dlite/source/System.cpp
View File

@@ -1695,7 +1695,7 @@ std::string System::currentTimeString() {
// Windows 64-bit
void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, uint32& edx) {
#if !defined(_M_ARM) && !defined(_M_ARM64) && !defined(_M_HYBRID_X86_ARM64) && !defined(_M_ARM64EC)
int regs[4] = {eax, ebx, ecx, edx};
int regs[4] = {(int)eax, (int)ebx, (int)ecx, (int)edx};
__cpuid(regs, func);
#else
int regs[4] = { 0, 0, 0, 0 };