lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch luajit GC and remove image_base settings 

to fix dyld shared cache errors on macOS 11
This commit is contained in:
Nevyn Bengtsson 2021-01-11 15:29:05 +01:00
parent 522987c211
commit 8108b6aa5a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -115,9 +115,10 @@ endif()
# Lua
if(LOVR_USE_LUAJIT AND NOT EMSCRIPTEN)
if (APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
endif()
# Required to make luajit compile without breaking linker cache on macOS Big Sur. Also, is a better,
# newer GC so enable it on all builds.
set(LUAJIT_ENABLE_GC64 ON)
if(LOVR_SYSTEM_LUA)
pkg_search_module(LUAJIT REQUIRED luajit)
include_directories(${LUAJIT_INCLUDE_DIRS})

2
deps/luajit vendored

@ -1 +1 @@
Subproject commit c37be68cf0876eb60f9f9ffd3920963f6ef01d7e
Subproject commit 05db1d35d8a35f74ce40d0ba5e387717ad91b24d