Maybe this is a slightly tidier way to fix PCH for compilerXML.cpp:
Index: src/plugins/compilergcc/compilerXML.h
===================================================================
--- src/plugins/compilergcc/compilerXML.h (revision 8155)
+++ src/plugins/compilergcc/compilerXML.h (working copy)
@@ -3,7 +3,7 @@
#include <compiler.h>
-#include <wx/string.h>
+class wxString;
class CompilerXML : public Compiler
{
@@ -28,7 +28,7 @@
none
};
- bool AddPath(const wxString& pth, int sm, int rmDirs = 0);
+ bool AddPath(const wxString& pth, SearchMode sm, int rmDirs = 0);
wxString m_fileName;
};
Index: src/plugins/compilergcc/compilerXML.cpp
===================================================================
--- src/plugins/compilergcc/compilerXML.cpp (revision 8155)
+++ src/plugins/compilergcc/compilerXML.cpp (working copy)
@@ -1,10 +1,12 @@
#include <sdk.h>
-#include <wx/arrstr.h>
-#include <wx/filefn.h>
-#include <wx/regex.h>
+#ifndef CB_PRECOMP
+ #include <wx/arrstr.h>
+ #include <wx/filefn.h>
+ #include <wx/regex.h>
+ #include <wx/xml/xml.h>
+#endif // CB_PRECOMP
#include <wx/textfile.h>
-#include <wx/xml/xml.h>
#ifdef __WXMSW__ // for wxRegKey
#include <wx/msw/registry.h>
#endif // __WXMSW__
@@ -243,7 +245,7 @@
return adrGuessed;
}
-bool CompilerXML::AddPath(const wxString& pth, int sm, int rmDirs)
+bool CompilerXML::AddPath(const wxString& pth, SearchMode sm, int rmDirs)
{
wxFileName fn(pth + wxFILE_SEP_PATH);
fn.Normalize(wxPATH_NORM_ENV_VARS|wxPATH_NORM_DOTS);