diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-09 14:17:25 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-06-20 01:19:17 +0200 |
| commit | 7d631f42d74942ef306197df6fe1ebed1bd234e3 (patch) | |
| tree | e84a52e992b2cfdd1379026ff86f3e8f0df373b7 /dep/g3dlite | |
| parent | cc86f7490f1297eb813575874902a16854501761 (diff) | |
Dep/g3d: Build fix for clang on windows
(cherry picked from commit a649f62a186cf5a9ebd976488fe641085a036f6a)
Diffstat (limited to 'dep/g3dlite')
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix19.diff | 13 | ||||
| -rw-r--r-- | dep/g3dlite/Readme.txt | 3 | ||||
| -rw-r--r-- | dep/g3dlite/source/System.cpp | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/dep/g3dlite/G3D-v9.0 hotfix19.diff b/dep/g3dlite/G3D-v9.0 hotfix19.diff new file mode 100644 index 00000000000..61735fe27eb --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix19.diff @@ -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 }; diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt index 3318bcbb3ed..30e86cc8b6d 100644 --- a/dep/g3dlite/Readme.txt +++ b/dep/g3dlite/Readme.txt @@ -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 diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp index 1c7d913929c..d6fbfa75679 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 }; |