Emulator-Archive/melonds-ds
1
0
Fork 0
mirror of https://github.com/JesseTG/melonds-ds.git synced 2024-11-23 14:40:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Simplify iOS builds

Browse Source 
- Fewer arguments need to be passed by default
This commit is contained in:
Jesse Talavera-Greenberg 2023-11-02 11:27:12 -04:00
parent 0e573965f5
commit badd201a22
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yaml vendored
View File

@ -74,7 +74,7 @@ jobs:
archive-name: melondsds_libretro-ios
info-dir: info
lib-ext: dylib
cmake-args: -DENABLE_OGLRENDERER=OFF -DENABLE_JIT=OFF --toolchain ./cmake/toolchain/ios.toolchain.cmake -DPLATFORM=OS64 -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=13.0 -DDEPLOYMENT_TARGET=14 -DENABLE_STRICT_TRY_COMPILE_INT:BOOL=ON
cmake-args: --toolchain ./cmake/toolchain/ios.toolchain.cmake -DPLATFORM=OS64 -DDEPLOYMENT_TARGET=14
# Disabled OpenGL on iOS due to https://github.com/JesseTG/melonds-ds/issues/23
test-linux-x86_64:

25
CMakeLists.txt
View File

@ -27,6 +27,31 @@ include(GitInfo)
option(TRACY_ENABLE "Build with Tracy support." OFF)
if (IOS)
message(STATUS "JIT is disabled by default in iOS builds.")
set(DEFAULT_ENABLE_JIT OFF)
else()
set(DEFAULT_ENABLE_JIT ON)
endif ()
option(ENABLE_JIT "Enable JIT support. Not supported on all platforms." ${DEFAULT_ENABLE_JIT})
if (ANDROID OR IOS OR APPLE)
message(STATUS "OpenGL is disabled by default on this platform.")
set(DEFAULT_ENABLE_OPENGL OFF)
else ()
set(DEFAULT_ENABLE_OPENGL ON)
endif ()
if (ANDROID)
set(DEFAULT_OPENGL_PROFILE OpenGLES2)
else ()
set(DEFAULT_OPENGL_PROFILE OpenGL)
endif ()
option(ENABLE_OPENGL "Enable OpenGL support. Not supported on all platforms; defaults to OFF in such case." ${DEFAULT_ENABLE_OPENGL})
set(ENABLE_OGLRENDERER ${ENABLE_OPENGL})
set(OPENGL_PROFILE ${DEFAULT_OPENGL_PROFILE} CACHE STRING "OpenGL profile to use if OpenGL is enabled. Valid values are 'OpenGL', 'OpenGLES2', 'OpenGLES3', 'OpenGLES31', and 'OpenGLES32'.")
set_property(CACHE OPENGL_PROFILE PROPERTY STRINGS OpenGL OpenGLES2 OpenGLES3)
include(cmake/utils.cmake)
include(cmake/FetchDependencies.cmake)
include(cmake/ConfigureFeatures.cmake)

14
cmake/ConfigureFeatures.cmake
View File

@ -1,18 +1,7 @@
# Detects the presence of various libraries or functions and sets the appropriate HAVE_* variables.
# Other files are used to actually configure the build.
if (ANDROID)
set(DEFAULT_OPENGL_PROFILE OpenGLES2)
else ()
set(DEFAULT_OPENGL_PROFILE OpenGL)
endif ()
if (ANDROID OR IOS OR APPLE)
message(STATUS "Disabling OpenGL because it's not supported on this platform")
set(DEFAULT_ENABLE_OPENGL OFF)
else ()
set(DEFAULT_ENABLE_OPENGL ON)
endif ()
option(ENABLE_DYNAMIC "Build with dynamic library support, if supported by the target." ON)
option(ENABLE_EGL "Build with EGL support, if supported by the target." OFF)
@ -20,9 +9,6 @@ option(ENABLE_NETWORKING "Build with networking support, if supported by the tar
option(ENABLE_SCCACHE "Build with sccache instead of ccache, if available." OFF)
option(ENABLE_ZLIB "Build with zlib support, if supported by the target." ON)
option(ENABLE_GLSM_DEBUG "Enable debug output for GLSM." OFF)
option(ENABLE_OPENGL "Enable OpenGL support. Not supported on all platforms; defaults to OFF in such case." ${DEFAULT_ENABLE_OPENGL})
set(OPENGL_PROFILE ${DEFAULT_OPENGL_PROFILE} CACHE STRING "OpenGL profile to use if OpenGL is enabled. Valid values are 'OpenGL', 'OpenGLES2', 'OpenGLES3', 'OpenGLES31', and 'OpenGLES32'.")
set_property(CACHE OPENGL_PROFILE PROPERTY STRINGS OpenGL OpenGLES2 OpenGLES3)
if (ENABLE_SCCACHE)
find_program(SCCACHE "sccache" PATHS "$ENV{HOME}/.cargo/bin")