walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Update build config for luajit on macOS

This commit is contained in:
Francesco Abbate 2021-10-03 13:21:36 -07:00
parent d263678171
commit e2badc9bc5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -38,6 +38,8 @@ endif
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
lite_link_args += ['-framework', 'CoreServices', '-framework', 'Foundation'] lite_link_args += ['-framework', 'CoreServices', '-framework', 'Foundation']
# the linker aguments below are needed by luajit on macOS
lite_link_args += ['-pagezero_size', '10000', '-image_base', '100000000']
endif endif
#=============================================================================== #===============================================================================
# Dependencies # Dependencies
@ -46,7 +48,7 @@ if not get_option('source-only')
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
libdl = cc.find_library('dl', required : false) libdl = cc.find_library('dl', required : false)
threads_dep = dependency('threads') threads_dep = dependency('threads')
lua_dep = dependency('luajit', fallback: ['luajit', 'luajit_dep'], lua_dep = dependency('luajit', fallback: ['luajit', 'lua_dep'],
default_options: ['default_library=static'] default_options: ['default_library=static']
) )
pcre2_dep = dependency('libpcre2-8') pcre2_dep = dependency('libpcre2-8')

2
subprojects/luajit.wrap
View File

@ -1,5 +1,5 @@
[wrap-git] [wrap-git]
directory = luajit directory = luajit
url = https://github.com/franko/luajit url = https://github.com/franko/luajit
revision = v2.0.5-lhelper3 revision = v2.0.5-lhelper4