mirror of
https://github.com/urbit/shrub.git
synced 2024-11-24 13:06:09 +03:00
Make meson build work with version 0.29.
This commit is contained in:
parent
b14b3216ba
commit
26fc29f2e4
@ -54,7 +54,7 @@ On macos, you need to make sure `pkg-config` uses the correct homebrew path.
|
||||
1. Install all required dependencies.
|
||||
2. `git submodule init` in the urbit repository
|
||||
3. `git submodule update`
|
||||
4. `meson build`
|
||||
4. `mkdir build && meson build`
|
||||
5. If the last step was successful, type `cd ./build` followed by `ninja`
|
||||
to compile urbit.
|
||||
6. The executable should appear in `./build` directory.
|
||||
|
10
meson.build
10
meson.build
@ -1,4 +1,4 @@
|
||||
project('urbit', 'c', meson_version: '>=0.40.0')
|
||||
project('urbit', 'c', meson_version: '>=0.29.0')
|
||||
|
||||
jets_a_src = [
|
||||
'jets/a/add.c',
|
||||
@ -221,7 +221,7 @@ os_link_flags = []
|
||||
if osdet == 'linux'
|
||||
conf_data.set('U3_OS_linux', true)
|
||||
|
||||
pthread_dep = meson.get_compiler('c').find_library('pthread')
|
||||
pthread_dep = find_library('pthread')
|
||||
ncurses_dep = dependency('ncurses')
|
||||
os_deps = os_deps + [pthread_dep, ncurses_dep]
|
||||
|
||||
@ -230,7 +230,7 @@ elif osdet == 'darwin'
|
||||
|
||||
os_c_flags = os_c_flags + ['-bind_at_load']
|
||||
# os_link_flags = ['-framework CoreServices', '-framework CoreFoundation']
|
||||
ncurses_dep = meson.get_compiler('c').find_library('ncurses')
|
||||
ncurses_dep = find_library('ncurses')
|
||||
os_deps = os_deps + [ncurses_dep]
|
||||
|
||||
elif osdet == 'bsd'
|
||||
@ -261,8 +261,8 @@ openssl_dep = dependency('openssl', version: '>=1.0.0')
|
||||
curl_dep = dependency('libcurl', version: '>=7.35.0')
|
||||
libuv_dep = dependency('libuv', version: '>=1.8.0')
|
||||
|
||||
gmp_dep = meson.get_compiler('c').find_library('gmp')
|
||||
sigsegv_dep = meson.get_compiler('c').find_library('sigsegv')
|
||||
gmp_dep = find_library('gmp')
|
||||
sigsegv_dep = find_library('sigsegv')
|
||||
|
||||
|
||||
# For these libs we provide fallback bundle
|
||||
|
Loading…
Reference in New Issue
Block a user