From ad7f0194ce2d89994b4d6fea8856238dd718a4a0 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Tue, 1 Dec 2009 16:36:34 +0100
Subject: Changed subsystem default back to 'gui'

---
 README.txt                                          |  1 +
 .../net/sf/antcontrib/cpptasks/SubsystemEnum.java   |  3 +--
 .../net/sf/antcontrib/cpptasks/TestLinkerDef.java   | 21 +++++++--------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/README.txt b/README.txt
index 2a536c3..b3d53b4 100644
--- a/README.txt
+++ b/README.txt
@@ -4,6 +4,7 @@ Modified version of ant contrib cpptasks, used in the freehep/maven-nar-plugin.
 
 * cpptasks-1.0-beta-5-parallel-1-SNAPSHOT
 
+- changed default subsystem back to gui
 - added linkFortranMain option to link with gfortranbegin, see NAR-112
 - added compileOrder to the compilerDef (and thus changed most Hashtables into Maps), see NAR-109
 - added .f90 as extension for the fortran compiler, see NAR-108
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java
index 24dac1b..19dd207 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java
@@ -26,8 +26,7 @@ public final class SubsystemEnum extends EnumeratedAttribute {
     private final static String[] values = new String[]{"gui", "console",
             "other"};
     public SubsystemEnum() {
-// FREEHEP changed from gui into console
-        setValue("console");
+        setValue("gui");
     }
     public String[] getValues() {
         return (String[]) values.clone();
diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java
index e35c5e6..994b068 100644
--- a/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java
+++ b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java
@@ -243,8 +243,7 @@ public final class TestLinkerDef
     setLinkerName(extendedLinker, "msvc");
     String[] preArgs = getPreArguments(extendedLinker);
     assertEquals("/NOLOGO", preArgs[0]);
-    // FREEHEP changed from WINDOWS into CONSOLE
-    assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]);
+    assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]);
     assertEquals("/INCREMENTAL:NO", preArgs[2]);
     assertEquals("/BASE:0x2710", preArgs[3]);
   }
@@ -261,8 +260,7 @@ public final class TestLinkerDef
     setLinkerName(extendedLinker, "msvc");
     String[] preArgs = getPreArguments(extendedLinker);
     assertEquals("/NOLOGO", preArgs[0]);
-    // FREEHEP changed from WINDOWS into CONSOLE
-    assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]);
+    assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]);
     assertEquals("/INCREMENTAL:NO", preArgs[2]);
     assertEquals("/STACK:0x2710", preArgs[3]);
   }
@@ -293,8 +291,7 @@ public final class TestLinkerDef
     setLinkerName(extendedLinker, "msvc");
     String[] preArgs = getPreArguments(extendedLinker);
     assertEquals("/NOLOGO", preArgs[0]);
-    // FREEHEP changed from WINDOWS into CONSOLE
-    assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]);
+    assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]);
     assertEquals("/INCREMENTAL:NO", preArgs[2]);
     assertEquals("/FIXED", preArgs[3]);
   }
@@ -311,8 +308,7 @@ public final class TestLinkerDef
     setLinkerName(extendedLinker, "msvc");
     String[] preArgs = getPreArguments(extendedLinker);
     assertEquals("/NOLOGO", preArgs[0]);
-    // FREEHEP changed from WINDOWS into CONSOLE
-    assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]);
+    assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]);
     assertEquals("/INCREMENTAL:YES", preArgs[2]);
   }
 
@@ -328,8 +324,7 @@ public final class TestLinkerDef
     setLinkerName(extendedLinker, "msvc");
     String[] preArgs = getPreArguments(extendedLinker);
     assertEquals("/NOLOGO", preArgs[0]);
-    // FREEHEP changed from WINDOWS into CONSOLE
-    assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]);
+    assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]);
     assertEquals("/INCREMENTAL:NO", preArgs[2]);
     assertEquals("/MAP", preArgs[3]);
   }
@@ -354,8 +349,7 @@ public final class TestLinkerDef
     extendedLinker.setBase(new FlexLong("10000"));
     String[] preArgs = getPreArguments(extendedLinker);
     assertEquals("/NOLOGO", preArgs[0]);
-    // FREEHEP changed from WINDOWS into CONSOLE
-    assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]);
+    assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]);
     assertEquals("/INCREMENTAL:NO", preArgs[2]);
     assertEquals("/BASE:0x2710", preArgs[3]);
   }
@@ -373,8 +367,7 @@ public final class TestLinkerDef
     extendedLinker.setBase(new FlexLong("10000"));
     String[] preArgs = getPreArguments(extendedLinker);
     assertEquals("/NOLOGO", preArgs[0]);
-    // FREEHEP changed from WINDOWS into CONSOLE
-    assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]);
+    assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]);
     assertEquals("/INCREMENTAL:NO", preArgs[2]);
     assertEquals("/BASE:0x2710", preArgs[3]);
   }
-- 
cgit v1.2.3