Mercurial > ecos-v2_0-branch

changeset 799:0db7ff500f45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* standalone/wxwin/mainwin.cpp: Fix behaviour of user tools warning message box. * standalone/wxwin/makefile.gnu: Deduce OS type using uname tool.
author jld
date Thu, 24 Apr 2003 11:09:43 +0000
parents 7d416c5f88a7
children d3e7234f6ce8
files host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/mainwin.cpp host/tools/configtool/standalone/wxwin/makefile.gnu
diffstat 3 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-24  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/mainwin.cpp: Fix behaviour of user tools warning
+	message box.
+
+	* standalone/wxwin/makefile.gnu: Deduce OS type using uname tool.
+
 2003-04-17  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/wxwin/appsettings.cpp, standalone/wxwin/mainwin.cpp:
--- a/host/tools/configtool/standalone/wxwin/mainwin.cpp
+++ b/host/tools/configtool/standalone/wxwin/mainwin.cpp
@@ -1234,9 +1234,8 @@ void ecMainFrame::OnBuildToolsPath(wxCom
 
     wxString msg;
     msg.Printf(_("Enter the location of the %s build tools\n"
-          "folder. You can\n"
-          "type in a path or use the Browse button to\n"
-          "navigate to a folder."),
+          "folder. You can type in a path or use the\n"
+          "Browse button to navigate to a folder."),
           (const wxChar*) (strPrefix.IsEmpty() ? wxString(wxT("native")) : strPrefix));
     wxString caption(_("Build Tools Path"));
 
@@ -1319,7 +1318,7 @@ void ecMainFrame::OnUserToolsPath(wxComm
         msg.Printf(wxT("%s does not appear to contain the user tools - use this folder anyway?"), (const wxChar*) path);
 
         if(strFile.Exists() ||
-            (wxID_YES == wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_QUESTION|wxYES_NO)))
+            (wxYES == wxMessageBox(msg, wxGetApp().GetSettings().GetAppName(), wxICON_QUESTION|wxYES_NO)))
         {
             wxGetApp().GetSettings().m_userToolsDir = path;
         }
--- a/host/tools/configtool/standalone/wxwin/makefile.gnu
+++ b/host/tools/configtool/standalone/wxwin/makefile.gnu
@@ -4,7 +4,7 @@
 
 # Usage:
 #   cd emptydir
-#   make -f /path/to/this/makefile WXDIR=/path/to/wx/installation INSTALLDIR=/path/to/ecos/tools [ ECOSSRCDIR=/path/to/ecos/tools/src ] [ TCLDIR=/path/to/tcl/installation ] [ OSTYPE=cygwin ] [ DEBUG=1 ]
+#   make -f /path/to/this/makefile WXDIR=/path/to/wx/installation INSTALLDIR=/path/to/ecos/tools [ ECOSSRCDIR=/path/to/ecos/tools/src ] [ TCLDIR=/path/to/tcl/installation ] [ DEBUG=1 ]
 
 INSTALLDIR=INSTALLDIR_not_defined
 WXDIR=WXDIR_not_defined
@@ -24,7 +24,7 @@ EXTRACPPFLAGS=\
   -DecUSE_EXPERIMENTAL_CODE=$(USEEXPERIMENTALCODE)
 EXTRALDFLAGS=-L$(TCLDIR)/lib -L$(INSTALLDIR)/lib -lcdl -lcyginfra -ltcl
 
-ifeq "$(OSTYPE)" "cygwin"
+ifneq (,$(findstring CYGWIN, $(shell uname)))
   PROGRAM=configtool.exe
   CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags` -D_WIN32 -D__WIN32__ -DSTRICT
   LDFLAGS=`$(WXDIR)/bin/wx-config --libs` -lshlwapi -Wl,--subsystem,windows