continue using system lib on macos cross build

Author: HeliumAnt

external/sources/LuaJIT-2.1/meson.build

@@ -1,20 +1,26 @@
 # Meson files from github.com/franko/luajit
 project('luajit', 'c', version : '2.0.5', default_options : ['c_winlibs='])
+
 pkg = import('pkgconfig')
 
 cc = meson.get_compiler('c')
 libm = cc.find_library('m', required : false)
 libdl = cc.find_library('dl', required : false)
 luajit_dependencies = [libm, libdl]
 
+
 luajit_source_dir = include_directories('src')
 luajit_abiver = '51'
 
+if not meson.can_run_host_binaries()
+    warning('Can\'t properly build in cross environment, using system library instead!')
+else
+
 dynasm = files('dynasm/dynasm.lua')
 
 subdir('src')
 
-if not get_option('use_prebuilt_libraries') or host_machine.system() in ['darwin', 'linux']
+if not get_option('use_prebuilt_libraries') or host_machine.system() in ['linux', 'darwin']
     libluajit = library(lj_libname, ljlib_sources + ljcore_sources + buildvm_headers,
         include_directories: luajit_source_dir,
         c_args: lj_defines,
@@ -40,3 +46,4 @@ luajit_dep = declare_dependency(
 )
 
 meson.override_dependency('luajit', luajit_dep)
+endif

meson.build

@@ -218,7 +218,7 @@ elif host_machine.system() == 'windows'
   libpng_dep = dependency('libpng')
   # Windows Libraries
   opengl = compiler.find_library('opengl32')
-  deps += [sdl2_dep, luajit_dep, zlib_dep, minizip_dep, libpng_dep, opengl]
+  deps += [sdl2_dep, zlib_dep, minizip_dep, libpng_dep, opengl]
 endif
 
 
@@ -230,8 +230,9 @@ boost_dep = declare_dependency(include_directories: include_directories('externa
 meson.override_dependency('boost-175', boost_dep)
 install_rpath = prefix/get_option('fmod_dir')
 allegro_proj = subproject('allegro 4.4.3.1-custom')
-luajit = subproject('LuaJIT-2.1')
+luajit_proj = subproject('LuaJIT-2.1')
 luajit_dep = dependency('luajit')
+external_inc_dirs += luajit_proj.get_variable('luajit_source_dir')
 allegro_dep = dependency('allegro')
 loadpng_dep = dependency('loadpng')
 luabind_proj = subproject('luabind-0.7.1')

meson_osxcross.txt

@@ -0,0 +1,15 @@
+[constants]
+arch = 'x86_64-apple-darwin20.2'
+[binaries]
+c = ['ccache', arch + '-gcc']
+cpp = ['ccache', arch + '-g++']
+strip = arch + '-strip'
+pkg-config = arch  + '-pkg-config'
+ranlib = arch + '-gcc-ranlib'
+ar = arch + '-gcc-ar'
+
+[host_machine]
+system = 'darwin'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'