mirror of
https://github.com/RetroDECK/org.zdoom.GZDoom.git
synced 2024-11-30 17:45:39 +00:00
Fix ARM support
This commit is contained in:
parent
bfffde8595
commit
62bac070ab
31
fixed-compilation-of-non-x86-targets.patch
Normal file
31
fixed-compilation-of-non-x86-targets.patch
Normal file
|
@ -0,0 +1,31 @@
|
|||
From 4c3c32dca6c1009c050476fa72fd441058a0bc64 Mon Sep 17 00:00:00 2001
|
||||
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
|
||||
Date: Sun, 7 Jun 2020 21:52:58 +0300
|
||||
Subject: [PATCH] - fixed compilation of non-x86 targets
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
src/common/utility/x86.cpp:48:6: error: ambiguating new declaration of ‘void DumpCPUInfo(const CPUInfo*)’
|
||||
---
|
||||
src/common/utility/x86.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/common/utility/x86.cpp b/src/common/utility/x86.cpp
|
||||
index 983360c09..d674ea24d 100644
|
||||
--- a/src/common/utility/x86.cpp
|
||||
+++ b/src/common/utility/x86.cpp
|
||||
@@ -45,8 +45,9 @@ void CheckCPUID(CPUInfo *cpu)
|
||||
cpu->DataL1LineSize = 32; // Assume a 32-byte cache line
|
||||
}
|
||||
|
||||
-void DumpCPUInfo(const CPUInfo *cpu)
|
||||
+FString DumpCPUInfo(const CPUInfo *cpu)
|
||||
{
|
||||
+ return FString();
|
||||
}
|
||||
#else
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"skip-arches": ["arm", "aarch64"]
|
||||
}
|
||||
|
|
@ -74,6 +74,9 @@ modules:
|
|||
# https://forum.zdoom.org/viewtopic.php?f=15&t=68365&sid=884a41102b499f98ed9c76a62ee0e41d
|
||||
- type: patch
|
||||
path: description.patch
|
||||
# Based on an upstream patch, that sadly didn't make it into the 4.4.0 release
|
||||
- type: patch
|
||||
path: fixed-compilation-of-non-x86-targets.patch
|
||||
- type: shell
|
||||
commands:
|
||||
- install -Dm 644 gzdoom.sf2 /app/share/sounds/sf2/gzdoom.sf2
|
||||
|
|
Loading…
Reference in a new issue