mirror of
https://github.com/bjornbytes/lovr.git
synced 2024-07-04 21:43:34 +00:00
Merge pull request #357 from alloverse/fix/bigsur-m1
Fixes for Big Sur and M1
This commit is contained in:
commit
ac13373a1c
|
@ -115,9 +115,10 @@ endif()
|
||||||
|
|
||||||
# Lua
|
# Lua
|
||||||
if(LOVR_USE_LUAJIT AND NOT EMSCRIPTEN)
|
if(LOVR_USE_LUAJIT AND NOT EMSCRIPTEN)
|
||||||
if (APPLE)
|
# Required to make luajit compile without breaking linker cache on macOS Big Sur. Also, is a better,
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
|
# newer GC so enable it on all builds.
|
||||||
endif()
|
set(LUAJIT_ENABLE_GC64 ON)
|
||||||
|
|
||||||
if(LOVR_SYSTEM_LUA)
|
if(LOVR_SYSTEM_LUA)
|
||||||
pkg_search_module(LUAJIT REQUIRED luajit)
|
pkg_search_module(LUAJIT REQUIRED luajit)
|
||||||
include_directories(${LUAJIT_INCLUDE_DIRS})
|
include_directories(${LUAJIT_INCLUDE_DIRS})
|
||||||
|
|
2
deps/luajit
vendored
2
deps/luajit
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit c37be68cf0876eb60f9f9ffd3920963f6ef01d7e
|
Subproject commit 05db1d35d8a35f74ce40d0ba5e387717ad91b24d
|
Loading…
Reference in a new issue