# HG changeset patch
# User jld
# Date 1049662147 0
# Node ID 97ac17e0e4deed56e4b5d995702f5cdecac9dc0d
# Parent  6aa5728bb6a0ee554c18d36eb6c3625255413307
* standalone/wxwin/makefile.gnu: Build Cygwin hosted configtool with
  "--subsystem windows" to eliminate the console window.
* standalone/wxwin/admindlg.cpp: Strip CR characters from the license
  text on Linux.

diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-05  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/makefile.gnu: Build Cygwin hosted configtool with
+	"--subsystem windows" to eliminate the console window.
+
+	* standalone/wxwin/admindlg.cpp: Strip CR characters from the license
+	text on Linux.
+
 2003-03-28  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/common/ecosconfig.cxx, standalone/wxwin/symbols.h:
diff --git a/host/tools/configtool/standalone/wxwin/admindlg.cpp b/host/tools/configtool/standalone/wxwin/admindlg.cpp
--- a/host/tools/configtool/standalone/wxwin/admindlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/admindlg.cpp
@@ -145,7 +145,7 @@ void ecAdminDialog::OnInitDialog(wxInitD
     }
     
     // populate the package tree
-    
+
     if (!PopulatePackageTree (m_strRepository))
     {
         m_strRepository = wxT("");
@@ -242,7 +242,7 @@ void ecAdminDialog::OnAdd(wxCommandEvent
                 // get an eCos package distribution file
                 
                 // extract the licence file
-                
+
                 wxString strCommand;
                 strCommand.Printf(wxT("add %s --extract_license"), (const wxChar*) strPathName);
                 strCommand.Replace(wxT("\\"), wxT("/")); // backslashes -> forward slashes for Tcl_EvalFile
@@ -251,9 +251,9 @@ void ecAdminDialog::OnAdd(wxCommandEvent
                 wxString strLicenseFile = m_strRepository + wxString(wxFILE_SEP_PATH) + wxT("pkgadd.txt");
 #ifdef __WXMSW__
                 strLicenseFile.Replace (wxT("/"), wxT("\\")); // forward slashes -> backslashes for Win32
-#endif                
+#endif
                 // read the license file
-                
+
                 wxFile fileLicenseFile;
                 if (fileLicenseFile.Exists (strLicenseFile) && fileLicenseFile.Open (strLicenseFile, wxFile::read))
                 {
@@ -269,9 +269,11 @@ void ecAdminDialog::OnAdd(wxCommandEvent
 #ifdef __WXMSW__
                     if (-1 == strLicenseText.Find (wxT("\r\n"))) // if the file has LF line endings...
                         strLicenseText.Replace (_T("\n"), _T("\r\n")); // ... replace with CRLF line endings
-#endif                    
+#else
+                    strLicenseText.Replace (_T("\r"), wxEmptyString); // remove CR characters
+#endif
                     // display the license text
-                    
+
                     ecLicenseDialog dlgLicense (strLicenseText, this, ecID_LICENSE_DIALOG, strPathName + _(" - Add Packages"));
                     if (wxID_OK != dlgLicense.ShowModal ()) // if license not accepted by user
                         continue; // try the next file
diff --git a/host/tools/configtool/standalone/wxwin/makefile.gnu b/host/tools/configtool/standalone/wxwin/makefile.gnu
--- a/host/tools/configtool/standalone/wxwin/makefile.gnu
+++ b/host/tools/configtool/standalone/wxwin/makefile.gnu
@@ -27,7 +27,7 @@ EXTRALDFLAGS=-L$(TCLDIR)/lib -L$(INSTALL
 ifeq "$(OSTYPE)" "cygwin"
   PROGRAM=configtool.exe
   CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags` -D_WIN32 -D__WIN32__ -DSTRICT
-  LDFLAGS=`$(WXDIR)/bin/wx-config --libs` -lshlwapi
+  LDFLAGS=`$(WXDIR)/bin/wx-config --libs` -lshlwapi -Wl,--subsystem,windows
   EXTRAOBJECTS=$(CTBUILDDIR)/configtoolres.o
 else
   PROGRAM=configtool