Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down