Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

CodeBlocks compiling fail

<< < (5/8) > >>

je_rem_y:
I tested your patch and it work perfectly (with all plugins too).
Great work, thank you ;)

It would be nice that it be added to the codeblocks source.

stahta01:
Feel free to submit to the Code::Blocks site; I do NOT have the time to keep it up to date till the devs approve it. Also, it needs more testing before the devs should even think about approving it.

http://developer.berlios.de/patch/?func=addpatch&group_id=5358

Tim S.

MortenMacFly:

--- Quote from: stahta01 on January 03, 2012, 07:32:35 pm ---Patch that needs tested. Note: It is not worth my time to test it.

--- End quote ---
OK, I think this patch is fine, but I believe you can safely remove the __WXMAC__ stuff, thus checking only for wxHAS_REGEX_ADVANCED should work on the Mac, too. I was under the impression that this was a Mac only issue, but it isn't as you see.

stahta01:
Removing the wxMAC macro from patch; building Code::Blocks on windows right now to verify syntax error not introduced.

Tim S.

stahta01:
Updated patch; still not really well tested. But, really not very major changes.
Should be verified it compiles for at least Linux and Mac would be good idea.

No Functional testing done by me; just compile only testing.

Tim S.


--- Code: ---Index: src/sdk/macrosmanager.cpp
===================================================================
--- src/sdk/macrosmanager.cpp (revision 7665)
+++ src/sdk/macrosmanager.cpp (working copy)
@@ -86,19 +86,19 @@
     m_RE_IfSp.Compile(_T("[^=!<>]+|(([^=!<>]+)[ ]*(=|==|!=|>|<|>=|<=)[ ]*([^=!<>]+))"), wxRE_EXTENDED | wxRE_NEWLINE);
     m_RE_Script.Compile(_T("(\\[\\[(.*)\\]\\])"), wxRE_EXTENDED | wxRE_NEWLINE);
     m_RE_ToAbsolutePath.Compile(_T("\\$TO_ABSOLUTE_PATH{([^}]*)}"),
-#ifndef __WXMAC__
+#ifdef wxHAS_REGEX_ADVANCED
                                 wxRE_ADVANCED);
 #else
                                 wxRE_EXTENDED);
 #endif
     m_RE_To83Path.Compile(_T("\\$TO_83_PATH{([^}]*)}"),
-#ifndef __WXMAC__
+#ifdef wxHAS_REGEX_ADVANCED
                                 wxRE_ADVANCED);
 #else
                                 wxRE_EXTENDED);
 #endif
     m_RE_RemoveQuotes.Compile(_T("\\$REMOVE_QUOTES{([^}]*)}"),
-#ifndef __WXMAC__
+#ifdef wxHAS_REGEX_ADVANCED
                                 wxRE_ADVANCED);
 #else
                                 wxRE_EXTENDED);
Index: src/plugins/contrib/ToolsPlus/PipedProcessCtrl.cpp
===================================================================
--- src/plugins/contrib/ToolsPlus/PipedProcessCtrl.cpp (revision 7665)
+++ src/plugins/contrib/ToolsPlus/PipedProcessCtrl.cpp (working copy)
@@ -206,7 +206,12 @@
 
 void PipedProcessCtrl::ParseLinks(int lineno, int lastline)
 {
-    wxRegEx re(m_linkregex,wxRE_ADVANCED|wxRE_NEWLINE);
+    #ifdef wxHAS_REGEX_ADVANCED
+        wxRegEx re(m_linkregex,wxRE_ADVANCED|wxRE_NEWLINE);
+    #else
+        wxRegEx re(m_linkregex,wxRE_EXTENDED|wxRE_NEWLINE);
+    #endif
+
     while(lineno<lastline)
     {
         int col=0;
@@ -305,7 +310,11 @@
     wxString text=m_textctrl->GetTextRange(start,end+1);
 
     //retrieve the file and line number parts of the link
-    wxRegEx re(m_linkregex,wxRE_ADVANCED|wxRE_NEWLINE);
+    #ifdef wxHAS_REGEX_ADVANCED
+        wxRegEx re(m_linkregex,wxRE_ADVANCED|wxRE_NEWLINE);
+    #else
+        wxRegEx re(m_linkregex,wxRE_EXTENDED|wxRE_NEWLINE);
+    #endif
     wxString file;
     long line;
     if(!re.Matches(text))
Index: src/plugins/contrib/DoxyBlocks/Expressions.h
===================================================================
--- src/plugins/contrib/DoxyBlocks/Expressions.h (revision 7665)
+++ src/plugins/contrib/DoxyBlocks/Expressions.h (working copy)
@@ -84,7 +84,7 @@
     "([^)]*)?"                      // The function's parameters.
     "\\)"                           // The closing parenthesis.
     ),
-#ifndef __WXMAC__
+#ifdef wxHAS_REGEX_ADVANCED
     wxRE_ADVANCED);
 #else
     wxRE_EXTENDED);
@@ -104,7 +104,7 @@
     "([^)]*)?"                      // The function's parameters.
     "\\)"                           // The closing parenthesis.
     ),
-#ifndef __WXMAC__
+#ifdef wxHAS_REGEX_ADVANCED
     wxRE_ADVANCED);
 #else
     wxRE_EXTENDED);

--- End code ---

Navigation

[0] Message Index

[#] Next page

[*] Previous page