Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 697d6e3

Browse files
committed
add lua5.2 dep for luajit2.1/moonjit users
1 parent 8d71e0b commit 697d6e3

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ The Linux build uses the meson build system, and builds against system libraries
5454
* `loadpng`
5555
* `flac`
5656
* `luajit`
57+
* `lua5.2` (if luajit >=2.1)
5758
* `minizip`
5859
* `lz4>=1.9.0`
5960
* `libpng`
@@ -96,7 +97,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
9697
## Installing Dependencies
9798

9899
**Arch Linux:**
99-
`# pacman -S allegro4 boost flac luajit minizip lz4 libpng libx11 xorg-xmessage meson ninja base-devel`
100+
`# pacman -S allegro4 boost flac luajit lua52 minizip lz4 libpng libx11 xorg-xmessage meson ninja base-devel`
100101

101102
**Ubuntu >=20.04:**
102103
`# apt-get install build-essential libboost-dev liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev ninja-build meson`

meson.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@ if host_machine.system() in ['linux','osx']
88
dependency('allegro'),
99
dependency('loadpng'),
1010
dependency('flac'),
11-
dependency('luajit'),
1211
dependency('minizip'),
1312
dependency('threads'),
1413
dependency('liblz4'),
1514
dependency('libpng'),
1615
dependency('boost'), #needed for luabind
1716
]
17+
luajit = dependency('luajit')
18+
deps += luajit
19+
if luajit.version() >= '2.1'
20+
deps += dependency('lua52')
21+
endif
1822
if host_machine.system() == 'linux'
1923
deps += dependency('x11')
2024
endif

0 commit comments

Comments
 (0)