X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeson.build;h=d9f7b14bd6c6458e46574a10c332261c7b0f0392;hb=72091d5c770856870bb8cd51bcc5641078c7562c;hp=02a42833bf7bfef5db51fdef00a441d51c756591;hpb=e6111686d731af1e621ea9f38babef50610f7717;p=tinc diff --git a/src/meson.build b/src/meson.build index 02a42833..d9f7b14b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -174,6 +174,7 @@ src_tincd = [ 'subnet.c', ] +cc_flags_tinc = cc_flags cc_flags_tincd = cc_flags deps_common = [] @@ -269,6 +270,9 @@ if not opt_curses.disabled() if dep_curses.found() cdata.set('HAVE_CURSES', 1) deps_tinc += dep_curses + if static + cc_flags_tinc += '-DNCURSES_STATIC' + endif endif endif @@ -354,16 +358,17 @@ endif subdir(opt_crypto) -if opt_crypto != 'openssl' - src_lib_crypto += 'crypto.c' -endif - if opt_crypto != 'nolegacy' src_lib_crypto += ['cipher.c', 'digest.c'] endif subdir('include') +have_sandbox = cdata.has('HAVE_SANDBOX') +if not have_sandbox + src_lib_common += 'sandbox.c' +endif + lib_crypto = static_library( 'tinc_crypto', sources: src_lib_crypto, @@ -392,6 +397,7 @@ lib_tinc = static_library( 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,