From 9b6f26c1910033196ea412d0e745e73b115ebec0 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Fri, 5 Mar 2021 17:59:54 +0300
Subject: [PATCH] mdldec: build with CONSOLE subsystem on Win32

---
 utils/mdldec/wscript |  2 +-
 wscript              | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/utils/mdldec/wscript b/utils/mdldec/wscript
index 7b5d7e18..48619987 100644
--- a/utils/mdldec/wscript
+++ b/utils/mdldec/wscript
@@ -27,7 +27,7 @@ def build(bld):
 		includes = includes,
 		use      = libs,
 		install_path = bld.env.BINDIR,
-		subsystem = bld.env.MSVC_SUBSYSTEM
+		subsystem = bld.env.CONSOLE_SUBSYSTEM
 	)
 
 	bld.install_files(bld.env.SHAREDIR, 'res/activities.txt')
diff --git a/wscript b/wscript
index 1f4ecb04..d9d09c75 100644
--- a/wscript
+++ b/wscript
@@ -114,10 +114,6 @@ def configure(conf):
 	if conf.options.IGNORE_PROJECTS:
 		conf.env.IGNORE_PROJECTS = conf.options.IGNORE_PROJECTS.split(',')
 
-	# Force XP compability, all build targets should add
-	# subsystem=bld.env.MSVC_SUBSYSTEM
-	# TODO: wrapper around bld.stlib, bld.shlib and so on?
-	conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01'
 	conf.env.MSVC_TARGETS = ['x86' if not conf.options.ALLOW64 else 'x64']
 
 	# Load compilers early
@@ -132,6 +128,14 @@ def configure(conf):
 
 	conf.load('msvs msdev subproject gitversion clang_compilation_database strip_on_install waf_unit_test enforce_pic')
 
+	# Force XP compatibility, all build targets should add subsystem=bld.env.MSVC_SUBSYSTEM
+	if conf.env.MSVC_TARGETS[0] == 'x86':
+		conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01'
+		conf.env.CONSOLE_SUBSYSTEM = 'CONSOLE,5.01'
+	else:
+		conf.env.MSVC_SUBSYSTEM = 'WINDOWS'
+		conf.env.CONSOLE_SUBSYSTEM = 'CONSOLE'
+
 	enforce_pic = True # modern defaults
 
 	# modify options dictionary early