Build fixes, get LTO+Os working on Windows

Signed-off-by: Andrew Opalach <andrew@akon.city>

2 files changed, 6 insertions, 8 deletions

diff --git a/src/fruits/cmsrv/meson.build b/src/fruits/cmsrv/meson.build
index bfeabe0..15b46b6 100644
--- a/src/fruits/cmsrv/meson.build
+++ b/src/fruits/cmsrv/meson.build
@@ -8,8 +8,9 @@ if use_tuis
   cmsrv_args += ['-DCMSRV_USE_UI']
 endif
 
+cmsrv_link_args = []
 if is_windows and not is_msvc
-  cmsrv_args += ['-static', '-static-libgcc', '-static-libstdc++', '-mwindows', '-municode']
+  cmsrv_link_args += ['-mconsole', '-municode', '-static', '-static-libgcc', '-static-libstdc++']
 endif
 
-executable('cmsrv', cmsrv_src, dependencies: cmsrv_deps, c_args: cmsrv_args, link_args: cmsrv_args, install: true)
+executable('cmsrv', cmsrv_src, dependencies: cmsrv_deps, c_args: cmsrv_args, link_args: cmsrv_link_args, install: true)
diff --git a/src/fruits/meson.build b/src/fruits/meson.build
index c82d71d..f53a653 100644
--- a/src/fruits/meson.build
+++ b/src/fruits/meson.build
@@ -1,7 +1,4 @@
-use_tuis = true
-if is_windows
-  use_tuis = false
-endif
+use_tuis = not is_windows
 
 if use_tuis and (get_option('server').enabled() or get_option('client').enabled())
   notcurses = dependency('notcurses', required: false, allow_fallback: false)
@@ -29,11 +26,11 @@ if use_tuis and (get_option('server').enabled() or get_option('client').enabled(
   endif
 endif
 
-if get_option('server').enabled() and not is_windows
+if get_option('server').enabled()
   subdir('cmsrv')
 endif
 
-if get_option('client').enabled() and not is_windows
+if get_option('client').enabled()
   subdir('cmc')
 endif