X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeson.build;h=6399ddb1b5383fad426a1aa571938c5574dbfa80;hb=7eeb29220a73ab9c5367f652873042f8a81c6cef;hp=02a42833bf7bfef5db51fdef00a441d51c756591;hpb=e6111686d731af1e621ea9f38babef50610f7717;p=tinc

diff --git a/src/meson.build b/src/meson.build
index 02a42833..6399ddb1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -119,6 +119,7 @@ src_lib_common = [
   'conf.c',
   'console.c',
   'dropin.c',
+  'fs.c',
   'keys.c',
   'list.c',
   'logger.c',
@@ -174,6 +175,13 @@ src_tincd = [
   'subnet.c',
 ]
 
+src_event_select = files('event_select.c')
+
+if os_name != 'windows'
+  src_tincd += 'signal.c'
+endif
+
+cc_flags_tinc = cc_flags
 cc_flags_tincd = cc_flags
 
 deps_common = []
@@ -204,6 +212,7 @@ endforeach
 
 if cdata.has('HAVE_SYS_UN_H')
   src_tincd += 'fd_device.c'
+  cdata.set('HAVE_FD_DEVICE', 1)
 endif
 
 confdata = configuration_data()
@@ -269,6 +278,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 +366,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 +405,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,