diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2442818..c0d7254 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,11 +30,19 @@ include: - project: 'libretro-infrastructure/ci-templates' file: 'osx-cmake-x86.yml'  - ################################## CELLULAR ################################ + ################################## CELLULAR ################################ # Android - project: 'libretro-infrastructure/ci-templates' file: '/android-cmake.yml' - + + # iOS + - project: 'libretro-infrastructure/ci-templates' + file: '/ios-cmake.yml' + + # tvOS + - project: 'libretro-infrastructure/ci-templates' + file: '/tvos-cmake.yml' + ################################## CONSOLES ################################ # Nintendo 3DS #- project: 'libretro-infrastructure/ci-templates' @@ -111,7 +119,19 @@ android-x86: extends: - .libretro-android-cmake-x86 - .core-defs - + +# iOS arm64 +libretro-build-ios-arm64: + extends: + - .libretro-ios-cmake-arm64 + - .core-defs + +# tvOS arm64 +libretro-build-tvos-arm64: + extends: + - .libretro-tvos-cmake-arm64 + - .core-defs + ################################### CONSOLES ################################# # Nintendo 3DS #libretro-build-ctr: diff --git a/CMakeLists.txt b/CMakeLists.txt index a694210..ee9f364 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,7 @@ add_library(dirksimple-lodepng STATIC ) set_target_properties(dirksimple-lodepng PROPERTIES POSITION_INDEPENDENT_CODE ON) -add_library(dirksimple-lua STATIC +set(LUA_SOURCES thirdparty/lua/src/lapi.c thirdparty/lua/src/ldebug.c thirdparty/lua/src/ldo.c @@ -161,12 +161,18 @@ add_library(dirksimple-lua STATIC thirdparty/lua/src/linit.c thirdparty/lua/src/lctype.c thirdparty/lua/src/ldblib.c - thirdparty/lua/src/liolib.c thirdparty/lua/src/lmathlib.c - thirdparty/lua/src/loslib.c thirdparty/lua/src/lcorolib.c thirdparty/lua/src/loadlib.c ) +# loslib.c and liolib.c use system()/popen() which are unavailable on iOS/tvOS +if(NOT CMAKE_SYSTEM_NAME STREQUAL "iOS" AND NOT CMAKE_SYSTEM_NAME STREQUAL "tvOS") + list(APPEND LUA_SOURCES + thirdparty/lua/src/loslib.c + thirdparty/lua/src/liolib.c + ) +endif() +add_library(dirksimple-lua STATIC ${LUA_SOURCES}) set_target_properties(dirksimple-lua PROPERTIES POSITION_INDEPENDENT_CODE ON) if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") target_compile_definitions(dirksimple-lua PRIVATE "-DLUA_USE_POSIX=1")