Developer forums (C::B DEVELOPMENT STRICTLY!) > Compiler Framework Redesign

XML based compilers

<< < (15/41) > >>

Jenna:

--- Quote from: Alpha on July 21, 2012, 07:02:48 am ---
--- Quote from: jens on July 20, 2012, 11:51:15 pm ---I just committed fixes to the linux project-file and the automake-system.

--- End quote ---
Sorry, I think this brakes the build system again.

--- End quote ---

No problem !

@MortenMacFly:
Should I do the linux fixes, or are you already working on it ?

Should be trivial, just deleting some files from src/plugins/compilergcc/Makefile.am and fixing the project-file for linux.
The new xml-files are handled automatically as long as they are in src/plugins/compilergcc/resources/compilers/ .

Alpha:
Maybe this is a slightly tidier way to fix PCH for compilerXML.cpp:

--- Code: ---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);

--- End code ---

MortenMacFly:

--- Quote from: Alpha on July 21, 2012, 04:30:17 pm ---Maybe this is a slightly tidier way to fix PCH for compilerXML.cpp:

--- Code: ----#include <wx/string.h>
+class wxString;
[...]
         wxString m_fileName;

--- End code ---

--- End quote ---
That is wrong. You cannot use a fwd decl if you are using  an instance of wxString. Its only valid when using only const refs or pointers.


--- Quote from: Alpha on July 21, 2012, 04:30:17 pm ---
--- Code: ---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);

--- End code ---

--- End quote ---
...although this is correct. :-)

Will do.


--- Quote from: jens on July 21, 2012, 09:30:39 am ---Should I do the linux fixes, or are you already working on it ?

--- End quote ---
I would prefer you do it. for me it would be a "Blindflug" as I am not under Linux.

oBFusCATed:

--- Quote from: MortenMacFly on July 21, 2012, 07:38:33 pm ---Its only valid when using only const refs or pointers.

--- End quote ---
Partially true, because normal (non-const) references are forward declarable, too.

Jenna:

--- Quote from: MortenMacFly on July 21, 2012, 07:38:33 pm ---
--- Quote from: jens on July 21, 2012, 09:30:39 am ---Should I do the linux fixes, or are you already working on it ?

--- End quote ---
I would prefer you do it. for me it would be a "Blindflug" as I am not under Linux.

--- End quote ---

Already done.

Navigation

[0] Message Index

[#] Next page

[*] Previous page