mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-10-25 21:31:08 +01:00
Fix aarch and android builds (#4576)
- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md). - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- credit: John and Crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4576 Reviewed-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
parent
989768aa46
commit
305f40100d
2 changed files with 17 additions and 1 deletions
|
|
@ -259,7 +259,7 @@ android {
|
|||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
version = "3.31.6"
|
||||
version = "3.31.5"
|
||||
path = file("${edenDir}/CMakeLists.txt")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
/* SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project */
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
|
|
@ -5,9 +8,22 @@
|
|||
|
||||
#define __ASSEMBLY__
|
||||
|
||||
// Newer Linux UAPI headers check __ASSEMBLER__ instead of __ASSEMBLY__ to hide C declarations.
|
||||
// Without it, asm-generic/signal.h redeclares sigset_t and clashes with glibc's. Only define it
|
||||
// around these includes, since glibc headers also look at __ASSEMBLER__.
|
||||
#ifndef __ASSEMBLER__
|
||||
#define __ASSEMBLER__
|
||||
#define EDEN_NCE_UNDEF_ASSEMBLER
|
||||
#endif
|
||||
|
||||
#include <asm-generic/signal.h>
|
||||
#include <asm-generic/unistd.h>
|
||||
|
||||
#ifdef EDEN_NCE_UNDEF_ASSEMBLER
|
||||
#undef __ASSEMBLER__
|
||||
#undef EDEN_NCE_UNDEF_ASSEMBLER
|
||||
#endif
|
||||
|
||||
#define ReturnToRunCodeByExceptionLevelChangeSignal SIGUSR2
|
||||
#define BreakFromRunCodeSignal SIGURG
|
||||
#define GuestAccessFaultSignal SIGSEGV
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue