Skip to content

Commit 4c31a7f

Browse files
committed
luajit built from source on all platforms
1 parent fa643b7 commit 4c31a7f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

meson.build

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ if host_machine.system() in ['linux','darwin']
195195
dependency(['sdl2']),
196196
dependency('flac'),
197197
dependency('minizip'),
198-
dependency('luajit'),
199198
dependency('threads'),
200199
dependency('liblz4'),
201200
dependency('libpng'),
@@ -211,8 +210,6 @@ if host_machine.system() in ['linux','darwin']
211210
elif host_machine.system() == 'windows'
212211
sdl2 = subproject('SDL2-2.26.3')
213212
sdl2_dep = dependency('sdl2')
214-
luajit = subproject('LuaJIT-2.1')
215-
luajit_dep = dependency('luajit')
216213
zlib = subproject('zlib-ng-2.1.3')
217214
zlib_dep = dependency('zlib')
218215
minizip = subproject('minizip-ng-4.0.0')
@@ -233,6 +230,8 @@ boost_dep = declare_dependency(include_directories: include_directories('externa
233230
meson.override_dependency('boost-175', boost_dep)
234231
install_rpath = prefix/get_option('fmod_dir')
235232
allegro_proj = subproject('allegro 4.4.3.1-custom')
233+
luajit = subproject('LuaJIT-2.1')
234+
luajit_dep = dependency('luajit')
236235
allegro_dep = dependency('allegro')
237236
loadpng_dep = dependency('loadpng')
238237
luabind_proj = subproject('luabind-0.7.1')
@@ -241,7 +240,7 @@ raknet_proj = subproject('RakNet')
241240
raknet_dep = dependency('RakNet')
242241
tracy_proj = subproject('tracy')
243242
tracy_dep = dependency('tracy')
244-
deps += [allegro_dep, loadpng_dep, raknet_dep, boost_dep, tracy_dep]
243+
deps += [allegro_dep, luajit_dep, loadpng_dep, raknet_dep, boost_dep, tracy_dep]
245244

246245
#### Sources Setup ####
247246
source_inc_dirs = []

0 commit comments

Comments
 (0)