godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch zstd to build for UWP ARM

Browse Source 
Patch comes from upstream and can be removed when it makes to stable
release.
This commit is contained in:
George Marques 2018-09-12 22:02:48 -03:00
parent ffd565aea0
commit fb6fe54058
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -523,3 +523,5 @@ Files extracted from upstream source:
- lib/{common/,compress/,decompress/,zstd.h} - lib/{common/,compress/,decompress/,zstd.h}
- LICENSE - LICENSE
- Applied the patch in `thirdparty/zstd/1314.diff` (PR 1314 upstream, already merged). Needed to build on UWP ARM. Can be removed when a new version is released with the patch.

13
thirdparty/zstd/1314.diff vendored Normal file
View File

@ -0,0 +1,13 @@
diff --git a/common/cpu.h b/common/cpu.h
index 88e0ebf44..eeb428ad5 100644
--- a/common/cpu.h
+++ b/common/cpu.h
@@ -36,7 +36,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
U32 f1d = 0;
U32 f7b = 0;
U32 f7c = 0;
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
int reg[4];
__cpuid((int*)reg, 0);
{

2
thirdparty/zstd/common/cpu.h vendored
View File

@ -36,7 +36,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
U32 f1d = 0; U32 f1d = 0;
U32 f7b = 0; U32 f7b = 0;
U32 f7c = 0; U32 f7c = 0;
#ifdef _MSC_VER #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
int reg[4]; int reg[4];
__cpuid((int*)reg, 0); __cpuid((int*)reg, 0);
{ {