From 65eaf561523cce82e0f84c4d8b65de811b103d19 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 31 Jan 2024 08:33:17 +0200 Subject: [PATCH 34/34] Meson: Don't open console for windows gui programs See osdn #43806 Signed-off-by: Marko Lindqvist --- meson.build | 52 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 803b3ad0b4..775f714744 100644 --- a/meson.build +++ b/meson.build @@ -1169,7 +1169,8 @@ else include_directories : ['dependencies/lua-5.4/src', 'dependencies/tolua-5.2/include'], link_with: fc_deps, - dependencies: m_dep + dependencies: m_dep, + win_subsystem: 'console' ) endif @@ -1497,7 +1498,8 @@ if server_type != 'disabled' include_directories: server_inc, link_with: [server_lib, common_lib, ais], dependencies: [m_dep, net_dep, readline_dep, gettext_dep, mw_extra_dep], - install: true + install: true, + win_subsystem: 'console' ) install_data( @@ -3246,7 +3248,8 @@ executable('freeciv-gtk3.22', include_directories: client_inc, dependencies: [gtk322_dep, net_dep, gettext_dep, mw_extra_dep], link_with: client_common, - install: true + install: true, + win_subsystem: 'windows' ) install_data('data/gtk3.22_menus.xml', @@ -3336,7 +3339,8 @@ executable('freeciv-gtk4', include_directories: client_inc, dependencies: [gtk4_dep, net_dep, gettext_dep, mw_extra_dep], link_with: client_common, - install: true + install: true, + win_subsystem: 'windows' ) install_data('data/themes/gtk4/Freeciv/gtk-4.0/gtk.css', @@ -3423,7 +3427,8 @@ executable('freeciv-gtk4x', include_directories: client_inc, dependencies: [gtk5_dep, net_dep, gettext_dep, mw_extra_dep], link_with: client_common, - install: true + install: true, + win_subsystem: 'windows' ) install_data( @@ -3530,7 +3535,9 @@ executable('freeciv-qt', dependencies: [qt_dep, net_dep, gettext_dep, mw_extra_dep], override_options: qt_opts, link_with: client_common, - install: true) + install: true, + win_subsystem: 'windows' + ) install_data( 'data/themes/gui-qt/icons/ai.png', @@ -3777,7 +3784,8 @@ executable('freeciv-sdl2', sdl2_image_dep, sdl2_gfx_dep, sdl2_ttf_dep, net_dep, gettext_dep, mw_extra_dep], link_with: client_common, - install: true + install: true, + win_subsystem: 'windows' ) install_data('data/themes/gui-sdl2/human/backgrounds.themespec', @@ -3909,7 +3917,8 @@ executable('freeciv-sdl2x', sdl3_image_dep, sdl3_gfx_dep, sdl3_ttf_dep, net_dep, gettext_dep, mw_extra_dep], link_with: client_common, - install: true + install: true, + win_subsystem: 'windows' ) install_data('data/themes/gui-sdl2/human/backgrounds.themespec', @@ -4006,7 +4015,8 @@ executable('freeciv-stub', include_directories: client_inc, dependencies: [audio_dep, net_dep, gettext_dep, mw_extra_dep], link_with: client_common, - install: true + install: true, + win_subsystem: 'console' ) endif @@ -4046,7 +4056,8 @@ executable('freeciv-mp-gtk3', include_directories: tool_inc, dependencies: [gtk322_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], - install: true + install: true, + win_subsystem: 'windows' ) install_data( @@ -4081,7 +4092,8 @@ executable('freeciv-mp-gtk4', include_directories: tool_inc, dependencies: [gtk4_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], - install: true + install: true, + win_subsystem: 'windows' ) install_data( @@ -4115,7 +4127,8 @@ executable('freeciv-mp-gtk4x', include_directories: tool_inc, dependencies: [gtk5_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], - install: true + install: true, + win_subsystem: 'windows' ) install_data( @@ -4157,7 +4170,8 @@ executable('freeciv-mp-qt', dependencies: [qt_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], override_options: qt_opts, - install: true + install: true, + win_subsystem: 'windows' ) install_data( @@ -4183,7 +4197,8 @@ executable('freeciv-mp-cli', include_directories: tool_inc, dependencies: [sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], - install: true + install: true, + win_subsystem: 'console' ) endif @@ -4209,7 +4224,8 @@ executable('freeciv-ruleup', link_with: [common_lib, server_lib, tool_lib, ais], include_directories: tool_inc, dependencies: [m_dep, net_dep, readline_dep, gettext_dep, mw_extra_dep], - install: true + install: true, + win_subsystem: 'console' ) endif @@ -4284,7 +4300,8 @@ executable('freeciv-ruledit', mw_extra_dep], link_with: [common_lib, server_lib, ais, tool_lib], override_options: qt_opts, - install: true + install: true, + win_subsystem: 'windows' ) install_data( @@ -4325,7 +4342,8 @@ executable('freeciv-manual', include_directories: [tool_inc, include_directories('client', 'client/include')], dependencies: [m_dep, net_dep, readline_dep, gettext_dep, mw_extra_dep], - install: true + install: true, + win_subsystem: 'console' ) endif -- 2.43.0