From 9b0eb0bedecdb259aeeb6c5f56d8d332a7134447 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 9 Aug 2002 03:21:52 +0000
Subject: [PATCH] Fix, by removing, declare default for user-interface free
 feature. Implement flags for user-interface feature in msvc and metrowerks.

[SVN r14748]
---
 features.jam            | 4 +---
 metrowerks-tools.jam    | 6 ++++++
 msvc-tools.jam          | 8 +++++++-
 v1/features.jam         | 4 +---
 v1/metrowerks-tools.jam | 6 ++++++
 v1/msvc-tools.jam       | 8 +++++++-
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/features.jam b/features.jam
index d937ad79a..e7e946968 100644
--- a/features.jam
+++ b/features.jam
@@ -20,7 +20,7 @@ feature optimization : off speed space ;
 feature inlining : off on full ;
 feature debug-symbols : on off : ;
 free-feature debug-store : object database ;
-free-feature user-interface : console gui ;
+free-feature user-interface : console gui ; # windows only, practically
 
 feature wide-character-support : on off ;
 feature exception-handling : on off ;
@@ -93,11 +93,9 @@ COMMON_PROPERTIES ?=
     <struct-alignment>auto
     <eh-model>default
     <threading>single
-    <user-interface>console
     <wide-character-support>on
     <exception-handling>on
     <rtti>on
-    <user-interface>console
     <shared-linkable>false
     
     # Borland link lines will need work to find the right libraries for unicode
diff --git a/metrowerks-tools.jam b/metrowerks-tools.jam
index 40f36f6f0..72d2e9d70 100644
--- a/metrowerks-tools.jam
+++ b/metrowerks-tools.jam
@@ -52,6 +52,12 @@ flags metrowerks CFLAGS <inlining>on : -inline on ;
 flags metrowerks CFLAGS <inlining>full : -inline auto -inline level=8 ;
 flags metrowerks CFLAGS <user-interface>console/<runtime-link>dynamic : -prefix UseDLLPrefix.h ;
 
+flags metrowerks LINKFLAGS <user-interface>console : "-subsystem console" ;
+flags metrowerks LINKFLAGS <user-interface>gui : "-subsystem windows" ;
+flags metrowerks LINKFLAGS <user-interface>wince : "-subsystem wince" ;
+flags metrowerks LINKFLAGS <user-interface>native : "-subsystem native" ;
+flags metrowerks LINKFLAGS <user-interface>auto : "-subsystem auto" ;
+
 flags metrowerks CFLAGS <eh-model>msvc : -exc ms ;
 
 if ! $(BOOST_CODEWARRIOR_6)
diff --git a/msvc-tools.jam b/msvc-tools.jam
index 982560221..61acf176d 100644
--- a/msvc-tools.jam
+++ b/msvc-tools.jam
@@ -104,6 +104,12 @@ flags msvc NEEDLIBS <library-file> ;
 flags msvc FINDLIBS <find-library> ;
 flags msvc LINKFLAGS <target-type>$(SHARED_TYPES) : /DLL ;
 
+flags msvc LINKFLAGS <user-interface>console : /subsystem:console ;
+flags msvc LINKFLAGS <user-interface>gui : /subsystem:windows ;
+flags msvc LINKFLAGS <user-interface>wince : /subsystem:windowsce ;
+flags msvc LINKFLAGS <user-interface>native : /subsystem:native ;
+flags msvc LINKFLAGS <user-interface>auto : /subsystem:posix ;
+
 
 rule vc-set-pdb-file ( targets + : name )
 {
@@ -136,7 +142,7 @@ rule Link-action ( target implib ? : sources + : target-type ? )
 actions together vc-Link
 {
     $(VC_SETUP)
-    "$(VC_TOOL_PATH)$(VC_LINKER)" /nologo /subsystem:console $(NOINCREMENTAL) $(LINKFLAGS) $(PDB_LINKFLAG)"$(VC_PDB_FILE)" /out:"$(<[1])" /IMPLIB:"$(<[2])" /LIBPATH:"$(LIBPATH)" /LIBPATH:"$(STDLIBPATH)" "$(FINDLIBS:S=.lib)" @"$(>)"
+    "$(VC_TOOL_PATH)$(VC_LINKER)" /nologo $(NOINCREMENTAL) $(LINKFLAGS) $(PDB_LINKFLAG)"$(VC_PDB_FILE)" /out:"$(<[1])" /IMPLIB:"$(<[2])" /LIBPATH:"$(LIBPATH)" /LIBPATH:"$(STDLIBPATH)" "$(FINDLIBS:S=.lib)" @"$(>)"
 }
 
 #### Cc #####
diff --git a/v1/features.jam b/v1/features.jam
index d937ad79a..e7e946968 100644
--- a/v1/features.jam
+++ b/v1/features.jam
@@ -20,7 +20,7 @@ feature optimization : off speed space ;
 feature inlining : off on full ;
 feature debug-symbols : on off : ;
 free-feature debug-store : object database ;
-free-feature user-interface : console gui ;
+free-feature user-interface : console gui ; # windows only, practically
 
 feature wide-character-support : on off ;
 feature exception-handling : on off ;
@@ -93,11 +93,9 @@ COMMON_PROPERTIES ?=
     <struct-alignment>auto
     <eh-model>default
     <threading>single
-    <user-interface>console
     <wide-character-support>on
     <exception-handling>on
     <rtti>on
-    <user-interface>console
     <shared-linkable>false
     
     # Borland link lines will need work to find the right libraries for unicode
diff --git a/v1/metrowerks-tools.jam b/v1/metrowerks-tools.jam
index 40f36f6f0..72d2e9d70 100644
--- a/v1/metrowerks-tools.jam
+++ b/v1/metrowerks-tools.jam
@@ -52,6 +52,12 @@ flags metrowerks CFLAGS <inlining>on : -inline on ;
 flags metrowerks CFLAGS <inlining>full : -inline auto -inline level=8 ;
 flags metrowerks CFLAGS <user-interface>console/<runtime-link>dynamic : -prefix UseDLLPrefix.h ;
 
+flags metrowerks LINKFLAGS <user-interface>console : "-subsystem console" ;
+flags metrowerks LINKFLAGS <user-interface>gui : "-subsystem windows" ;
+flags metrowerks LINKFLAGS <user-interface>wince : "-subsystem wince" ;
+flags metrowerks LINKFLAGS <user-interface>native : "-subsystem native" ;
+flags metrowerks LINKFLAGS <user-interface>auto : "-subsystem auto" ;
+
 flags metrowerks CFLAGS <eh-model>msvc : -exc ms ;
 
 if ! $(BOOST_CODEWARRIOR_6)
diff --git a/v1/msvc-tools.jam b/v1/msvc-tools.jam
index 982560221..61acf176d 100644
--- a/v1/msvc-tools.jam
+++ b/v1/msvc-tools.jam
@@ -104,6 +104,12 @@ flags msvc NEEDLIBS <library-file> ;
 flags msvc FINDLIBS <find-library> ;
 flags msvc LINKFLAGS <target-type>$(SHARED_TYPES) : /DLL ;
 
+flags msvc LINKFLAGS <user-interface>console : /subsystem:console ;
+flags msvc LINKFLAGS <user-interface>gui : /subsystem:windows ;
+flags msvc LINKFLAGS <user-interface>wince : /subsystem:windowsce ;
+flags msvc LINKFLAGS <user-interface>native : /subsystem:native ;
+flags msvc LINKFLAGS <user-interface>auto : /subsystem:posix ;
+
 
 rule vc-set-pdb-file ( targets + : name )
 {
@@ -136,7 +142,7 @@ rule Link-action ( target implib ? : sources + : target-type ? )
 actions together vc-Link
 {
     $(VC_SETUP)
-    "$(VC_TOOL_PATH)$(VC_LINKER)" /nologo /subsystem:console $(NOINCREMENTAL) $(LINKFLAGS) $(PDB_LINKFLAG)"$(VC_PDB_FILE)" /out:"$(<[1])" /IMPLIB:"$(<[2])" /LIBPATH:"$(LIBPATH)" /LIBPATH:"$(STDLIBPATH)" "$(FINDLIBS:S=.lib)" @"$(>)"
+    "$(VC_TOOL_PATH)$(VC_LINKER)" /nologo $(NOINCREMENTAL) $(LINKFLAGS) $(PDB_LINKFLAG)"$(VC_PDB_FILE)" /out:"$(<[1])" /IMPLIB:"$(<[2])" /LIBPATH:"$(LIBPATH)" /LIBPATH:"$(STDLIBPATH)" "$(FINDLIBS:S=.lib)" @"$(>)"
 }
 
 #### Cc #####