eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 59 Projects 1 Releases Packages Wiki Activity Actions

Test
Some checks failed
eden-license / license-header (pull_request) Failing after 28s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-10-08 00:19:32 -04:00
parent e13e796605
commit 77f52784cd
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 101 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

134
CMakeModules/DetectArchitecture.cmake
View file

@ -19,7 +19,6 @@ adds compile definitions thereof. Namely:
This file is based off of Yuzu and Dynarmic. This file is based off of Yuzu and Dynarmic.
TODO: add SPARC TODO: add SPARC
]] ]]
include(CheckSymbolExists)
# multiarch builds are a special case and also very difficult # multiarch builds are a special case and also very difficult
# this is what I have for now, but it's not ideal # this is what I have for now, but it's not ideal
@ -40,14 +39,17 @@ if (CMAKE_OSX_ARCHITECTURES)
return() return()
endif() endif()
include(CheckSymbolExists)
function(detect_architecture symbol arch) function(detect_architecture symbol arch)
unset(SYMBOL_EXISTS CACHE)
if (NOT DEFINED ARCHITECTURE) if (NOT DEFINED ARCHITECTURE)
set(CMAKE_REQUIRED_QUIET 1) set(CMAKE_REQUIRED_QUIET 1)
check_symbol_exists("${symbol}" "" ARCHITECTURE_${arch}) check_symbol_exists("${symbol}" "" SYMBOL_EXISTS)
unset(CMAKE_REQUIRED_QUIET) unset(CMAKE_REQUIRED_QUIET)
if (ARCHITECTURE_${arch}) # The output variable needs to be unique across invocations otherwise
message(STATUS "[DetectArchitecture] Found architecture symbol ${symbol} for ${arch}") # CMake's crazy scope rules will keep it defined
if (SYMBOL_EXISTS)
set(ARCHITECTURE "${arch}" PARENT_SCOPE) set(ARCHITECTURE "${arch}" PARENT_SCOPE)
set(ARCHITECTURE_${arch} 1 PARENT_SCOPE) set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
add_definitions(-DARCHITECTURE_${arch}=1) add_definitions(-DARCHITECTURE_${arch}=1)
@ -55,47 +57,109 @@ function(detect_architecture symbol arch)
endif() endif()
endfunction() endfunction()
function(detect_architecture_symbols)
if (DEFINED ARCHITECTURE)
return()
endif()
set(oneValueArgs ARCH)
set(multiValueArgs SYMBOLS)
cmake_parse_arguments(ARGS "" "${oneValueArgs}" "${multiValueArgs}"
"${ARGN}")
set(arch "${ARGS_ARCH}")
message(STATUS "Architecture: symbols ${ARGS_SYMBOLS} for arch ${arch}")
foreach(symbol ${ARGS_SYMBOLS})
detect_architecture("${symbol}" "${arch}")
message(STATUS "Architecture: symbol ${symbol} ${ARCHITECTURE_${arch}}")
if (ARCHITECTURE_${arch})
message(STATUS "[DetectArchitecture] Found architecture symbol ${symbol} for ${arch}")
set(ARCHITECTURE "${arch}" PARENT_SCOPE)
set(ARCHITECTURE_${arch} 1 PARENT_SCOPE)
add_definitions(-DARCHITECTURE_${arch}=1)
return()
endif()
endforeach()
endfunction()
function(DetectArchitecture) function(DetectArchitecture)
detect_architecture("__ARM64__" arm64) detect_architecture_symbols(
detect_architecture("__aarch64__" arm64) ARCH arm64
detect_architecture("_M_ARM64" arm64) SYMBOLS
"__ARM64__"
"__aarch64__"
"_M_ARM64")
detect_architecture("__arm__" arm) detect_architecture_symbols(
detect_architecture("__TARGET_ARCH_ARM" arm) ARCH arm
detect_architecture("_M_ARM" arm) SYMBOLS
"__arm__"
"__TARGET_ARCH_ARM"
"_M_ARM")
detect_architecture("__x86_64" x86_64) detect_architecture_symbols(
detect_architecture("__x86_64__" x86_64) ARCH x86_64
detect_architecture("__amd64" x86_64) SYMBOLS
detect_architecture("_M_X64" x86_64) "__x86_64"
"__x86_64__"
"__amd64"
"_M_X64"
"_M_AMD64")
detect_architecture("__i386" x86) detect_architecture_symbols(
detect_architecture("__i386__" x86) ARCH x86
detect_architecture("_M_IX86" x86) SYMBOLS
"__i386"
"__i386__"
"_M_IX86")
detect_architecture("__ia64" ia64) detect_architecture_symbols(
detect_architecture("__ia64__" ia64) ARCH ia64
detect_architecture("_M_IA64" ia64) SYMBOLS
"__ia64"
"__ia64__"
"_M_IA64")
detect_architecture("__mips" mips) detect_architecture_symbols(
detect_architecture("__mips__" mips) ARCH mips
detect_architecture("_M_MRX000" mips) SYMBOLS
"__mips"
"__mips__"
"_M_MRX000")
detect_architecture("__ppc64__" ppc64) detect_architecture_symbols(
detect_architecture("__powerpc64__" ppc64) ARCH ppc64
SYMBOLS
"__ppc64__"
"__powerpc64__")
detect_architecture("__ppc__" ppc) detect_architecture_symbols(
detect_architecture("__ppc" ppc) ARCH ppc
detect_architecture("__powerpc__" ppc) SYMBOLS
detect_architecture("_ARCH_COM" ppc) "__ppc__"
detect_architecture("_ARCH_PWR" ppc) "__ppc"
detect_architecture("_ARCH_PPC" ppc) "__powerpc__"
detect_architecture("_M_MPPC" ppc) "_ARCH_COM"
detect_architecture("_M_PPC" ppc) "_ARCH_PWR"
"_ARCH_PPC"
"_M_MPPC"
"_M_PPC")
detect_architecture("__riscv" riscv) detect_architecture_symbols(
ARCH riscv
SYMBOLS
"__riscv")
detect_architecture_symbols(
ARCH wasm
SYMBOLS
"__EMSCRIPTEN__")
detect_architecture("__EMSCRIPTEN__" wasm)
if (NOT DEFINED ARCHITECTURE) if (NOT DEFINED ARCHITECTURE)
set(ARCHITECTURE "GENERIC") set(ARCHITECTURE "GENERIC")

2
tools/cpm/download.sh
View file

@ -57,6 +57,8 @@ download_package() {
mv ./.* "$OUTDIR" 2>/dev/null || true mv ./.* "$OUTDIR" 2>/dev/null || true
fi fi
cd "$OUTDIR"
if echo "$JSON" | grep -e "patches" > /dev/null; then if echo "$JSON" | grep -e "patches" > /dev/null; then
PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")') PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")')
for patch in $PATCHES; do for patch in $PATCHES; do