Mercurial > flash_v2
diff host/tools/configtool/standalone/win32/Configtool.cpp @ 153:5e8f3b328bb3
Merge from eCos master repository on 2001-02-19-15:48:12-GMT
| author | jlarmour |
|---|---|
| date | Mon, 19 Feb 2001 17:27:10 +0000 |
| parents | 6736c52df507 |
| children | 0d0f03f76f6a |
line wrap: on
line diff
--- a/host/tools/configtool/standalone/win32/Configtool.cpp +++ b/host/tools/configtool/standalone/win32/Configtool.cpp @@ -359,18 +359,36 @@ void CConfigToolApp::LoadStdProfileSetti } } } - - GetRepositoryRegistryClues(m_arstrUserToolPaths, _T("GNUPro unsupported")); - for(i=0;i<m_arstrUserToolPaths.GetSize();i++){ - CFileName str(m_arstrUserToolPaths[i]); - str+="H-i686-cygwin32\\bin"; - if(str.IsDir()){ - m_arstrUserToolPaths.SetAt(i,str); - } else { - m_arstrUserToolPaths.RemoveAt(i); - i--; + + // Look for Cygwin 00r1 first, since it's the latest and greatest user tools. + GetRepositoryRegistryClues(m_arstrUserToolPaths, _T("Cygwin 00r1")); + if (m_arstrUserToolPaths.GetSize() > 0) + { + for(i=0;i<m_arstrUserToolPaths.GetSize();i++){ + CFileName str(m_arstrUserToolPaths[i]); + str+="H-i686-pc-cygwin\\bin"; + if(str.IsDir()){ + m_arstrUserToolPaths.SetAt(i,str); + } else { + m_arstrUserToolPaths.RemoveAt(i); + i--; + } } } + else + { + GetRepositoryRegistryClues(m_arstrUserToolPaths, _T("GNUPro unsupported")); + for(i=0;i<m_arstrUserToolPaths.GetSize();i++){ + CFileName str(m_arstrUserToolPaths[i]); + str+="H-i686-cygwin32\\bin"; + if(str.IsDir()){ + m_arstrUserToolPaths.SetAt(i,str); + } else { + m_arstrUserToolPaths.RemoveAt(i); + i--; + } + } + } // Include the path in the set of potential user paths {
