projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mingw: fix static linking with recent ncurses
[tinc]
/
src
/
meson.build
diff --git
a/src/meson.build
b/src/meson.build
index
351124e
..
adf82f6
100644
(file)
--- a/
src/meson.build
+++ b/
src/meson.build
@@
-62,6
+62,7
@@
check_headers = [
'sys/ioctl.h',
'sys/mman.h',
'sys/param.h',
'sys/ioctl.h',
'sys/mman.h',
'sys/param.h',
+ 'sys/random.h',
'sys/resource.h',
'sys/socket.h',
'sys/stat.h',
'sys/resource.h',
'sys/socket.h',
'sys/stat.h',
@@
-85,6
+86,7
@@
check_functions = [
'explicit_bzero',
'explicit_memset',
'fchmod',
'explicit_bzero',
'explicit_memset',
'fchmod',
+ 'getentropy',
'gettimeofday',
'memset_s',
'mlockall',
'gettimeofday',
'memset_s',
'mlockall',
@@
-172,6
+174,7
@@
src_tincd = [
'subnet.c',
]
'subnet.c',
]
+cc_flags_tinc = cc_flags
cc_flags_tincd = cc_flags
deps_common = []
cc_flags_tincd = cc_flags
deps_common = []
@@
-267,6
+270,9
@@
if not opt_curses.disabled()
if dep_curses.found()
cdata.set('HAVE_CURSES', 1)
deps_tinc += dep_curses
if dep_curses.found()
cdata.set('HAVE_CURSES', 1)
deps_tinc += dep_curses
+ if static
+ cc_flags_tinc += '-DNCURSES_STATIC'
+ endif
endif
endif
endif
endif
@@
-390,6
+396,7
@@
lib_tinc = static_library(
sources: src_tinc,
dependencies: deps_tinc,
link_with: lib_common,
sources: src_tinc,
dependencies: deps_tinc,
link_with: lib_common,
+ c_args: cc_flags_tinc,
implicit_include_directories: false,
include_directories: inc_conf,
build_by_default: false,
implicit_include_directories: false,
include_directories: inc_conf,
build_by_default: false,