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

Commit 201891e

Browse files
committed
all relevant distros use luajit 2.1, so update accordingly
1 parent 697d6e3 commit 201891e

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/meson.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Dependencies
2626
run: |
2727
sudo apt-get update -yq
28-
sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
28+
sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev
2929
3030
- name: Install Clang
3131
# You may pin to the exact commit or the version.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
100100
`# pacman -S allegro4 boost flac luajit lua52 minizip lz4 libpng libx11 xorg-xmessage meson ninja base-devel`
101101

102102
**Ubuntu >=20.04:**
103-
`# 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`
103+
`# apt-get install build-essential libboost-dev liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev ninja-build meson`
104104
## Troubleshooting
105105

106106
* On some distros some keyboards and mice are recognized as controllers, to fix this follow these instructions: [https://github.com/denilsonsa/udev-joystick-blacklist](https://github.com/denilsonsa/udev-joystick-blacklist)

meson.build

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ if host_machine.system() in ['linux','osx']
99
dependency('loadpng'),
1010
dependency('flac'),
1111
dependency('minizip'),
12+
dependency('luajit'),
13+
dependency('lua52'),
1214
dependency('threads'),
1315
dependency('liblz4'),
1416
dependency('libpng'),
1517
dependency('boost'), #needed for luabind
1618
]
17-
luajit = dependency('luajit')
18-
deps += luajit
19-
if luajit.version() >= '2.1'
20-
deps += dependency('lua52')
21-
endif
2219
if host_machine.system() == 'linux'
2320
deps += dependency('x11')
2421
endif

0 commit comments

Comments
 (0)