debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-09-26 11:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix1

Browse Source
This commit is contained in:
lizzie
2026-02-23 04:31:43 +00:00
parent a020ce62f8
commit cc8ea0f574
5 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/ios/build.sh
-1
View File
@@ -26,7 +26,6 @@ cmake -G Xcode -B build \
-DYUZU_CMD=OFF \ -DYUZU_CMD=OFF \
-DUSE_DISCORD_PRESENCE=OFF \ -DUSE_DISCORD_PRESENCE=OFF \
-DYUZU_USE_EXTERNAL_FFMPEG=ON \ -DYUZU_USE_EXTERNAL_FFMPEG=ON \
-DYUZU_USE_CPM=ON \
-DYUZU_USE_EXTERNAL_SDL2=ON \ -DYUZU_USE_EXTERNAL_SDL2=ON \
-DCPMUTIL_FORCE_BUNDLED=ON \ -DCPMUTIL_FORCE_BUNDLED=ON \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
CMakeLists.txt
+1 -1
View File
@@ -308,7 +308,7 @@ if (YUZU_ROOM)
add_compile_definitions(YUZU_ROOM) add_compile_definitions(YUZU_ROOM)
endif() endif()
if (UNIX AND NOT (LINUX OR WIN32)) if ((UNIX OR IOS) AND NOT (LINUX OR WIN32))
if(CXX_APPLE OR CXX_CLANG) if(CXX_APPLE OR CXX_CLANG)
# libc++ has stop_token and jthread as experimental # libc++ has stop_token and jthread as experimental
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
docs/Caveats.md
+11
View File
@@ -6,6 +6,7 @@
- [macOS](#macos) - [macOS](#macos)
- [OpenIndiana](#openindiana) - [OpenIndiana](#openindiana)
- [OmniOS](#omnios) - [OmniOS](#omnios)
- [iOS](#ios)
- [HaikuOS](#haikuos) - [HaikuOS](#haikuos)
- [OpenBSD](#openbsd) - [OpenBSD](#openbsd)
- [FreeBSD](#freebsd) - [FreeBSD](#freebsd)
@@ -90,6 +91,16 @@ If it wasn't obvious already, you require a X11 server to properly run the emula
For Solaris based OSes, `${CMAKE_SYSTEM_NAME}` isn't properly set on CMake (it's set to i686 on AMD64), you may find issues when building OpenSSL from `openssl-cmake`. For Solaris based OSes, `${CMAKE_SYSTEM_NAME}` isn't properly set on CMake (it's set to i686 on AMD64), you may find issues when building OpenSSL from `openssl-cmake`.
## iOS
iOS has a dedicated build script, we **highly** recommend using that instead of doing anything else, we don't support any other configuration than the one present in said build script.
To build, it's simply as easy as doing
```sh
chmod +x .ci/ios/build.sh
.ci/ios/build.sh
```
## HaikuOS ## HaikuOS
It's recommended to do a `pkgman full-sync` before installing. See [HaikuOS: Installing applications](https://www.haiku-os.org/guides/daily-tasks/install-applications/). Sometimes the process may be interrupted by an error like "Interrupted syscall". Simply firing the command again fixes the issue. By default `g++` is included on the default installation. It's recommended to do a `pkgman full-sync` before installing. See [HaikuOS: Installing applications](https://www.haiku-os.org/guides/daily-tasks/install-applications/). Sometimes the process may be interrupted by an error like "Interrupted syscall". Simply firing the command again fixes the issue. By default `g++` is included on the default installation.
externals/cmake-modules/DetectPlatform.cmake
Vendored
+6
View File
@@ -54,6 +54,12 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
set(CXX_APPLE ON) set(CXX_APPLE ON)
endif() endif()
# This fixes some quirks with xcrun or weird iOS toolchain cmake files
if (IOS)
unser(CXX_CLANG)
set(CXX_APPLE ON)
endif()
# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11112 # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11112
# This works totally fine on MinGW64, but not CLANG{,ARM}64 # This works totally fine on MinGW64, but not CLANG{,ARM}64
if(MINGW AND CXX_CLANG) if(MINGW AND CXX_CLANG)
externals/ffmpeg/CMakeLists.txt
Vendored
+4 -3
View File
@@ -31,15 +31,16 @@ if (NOT YUZU_USE_BUNDLED_FFMPEG)
set(FFmpeg_IS_CROSS_COMPILING TRUE) set(FFmpeg_IS_CROSS_COMPILING TRUE)
elseif(IOS) elseif(IOS)
execute_process(COMMAND xcrun --sdk iphoneos --show-sdk-path OUTPUT_VARIABLE SYSROOT) execute_process(COMMAND xcrun --sdk iphoneos --show-sdk-path OUTPUT_VARIABLE SYSROOT)
# Lovely extra newline apple adds that **we** must remove... thank you apple!
string(STRIP "${SYSROOT}" SYSROOT)
set(FFmpeg_CC xcrun --sdk iphoneos clang -arch arm64) set(FFmpeg_CC xcrun --sdk iphoneos clang -arch arm64)
set(FFmpeg_CXX xcrun --sdk iphoneos clang++ -arch arm64) set(FFmpeg_CXX xcrun --sdk iphoneos clang++ -arch arm64)
list(APPEND FFmpeg_CROSS_COMPILE_FLAGS list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
--arch=arm64 --arch=arm64
--enable-cross-compile --enable-cross-compile
--sysroot=${SYSROOT} --sysroot="${SYSROOT}"
--target-os=darwin
--extra-ldflags="-miphoneos-version-min=16.0" --extra-ldflags="-miphoneos-version-min=16.0"
--install-name-dir="@rpath" --install-name-dir='@rpath'
--disable-audiotoolbox --disable-audiotoolbox
) )
set(FFmpeg_IS_CROSS_COMPILING TRUE) set(FFmpeg_IS_CROSS_COMPILING TRUE)