Build patches to CB Core projects and wxContribItems Plugins.

[stahta01]

Two more CB Project patches.

0001-Core-app-plugins-Added-target-Abbreviations-to-virtu.patch

Code Select Expand


From 4a197b9cd56f5997d330f36030966fa8cfc7fe57 Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Tue, 1 Dec 2015 22:16:44 -0500
Subject: [PATCH 1/2] - Core app & plugins: Added target Abbreviations to
virtual target. (Thanks stahta01)

---
src/CodeBlocks-unix.cbp      | 2 +-
src/CodeBlocks.cbp           | 2 +-
src/CodeBlocks_wx30-unix.cbp | 2 +-
src/CodeBlocks_wx30.cbp      | 2 +-
src/CodeBlocks_wx30_64.cbp   | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CodeBlocks-unix.cbp b/src/CodeBlocks-unix.cbp
index 02786ee..d8754b7 100644
--- a/src/CodeBlocks-unix.cbp
+++ b/src/CodeBlocks-unix.cbp
@@ -481,7 +481,7 @@
</Build>
<VirtualTargets>
<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
- <Add alias="Core app &amp; plugins" targets="sdk;src;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
+ <Add alias="Core app &amp; plugins" targets="sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;Compiler depslib;" />
</VirtualTargets>
<Compiler>
diff --git a/src/CodeBlocks.cbp b/src/CodeBlocks.cbp
index 645ed78..682a8b8 100644
--- a/src/CodeBlocks.cbp
+++ b/src/CodeBlocks.cbp
@@ -708,7 +708,7 @@
</Build>
<VirtualTargets>
<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
- <Add alias="Core app &amp; plugins" targets="sdk;src;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
+ <Add alias="Core app &amp; plugins" targets="sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;wxpropgrid;Compiler depslib;" />
</VirtualTargets>
<Compiler>
diff --git a/src/CodeBlocks_wx30-unix.cbp b/src/CodeBlocks_wx30-unix.cbp
index b22824f..17703cb 100644
--- a/src/CodeBlocks_wx30-unix.cbp
+++ b/src/CodeBlocks_wx30-unix.cbp
@@ -514,7 +514,7 @@
</Build>
<VirtualTargets>
<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
- <Add alias="Core app &amp; plugins" targets="sdk;src;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
+ <Add alias="Core app &amp; plugins" targets="sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;" />
<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;Compiler depslib;" />
</VirtualTargets>
<Compiler>
diff --git a/src/CodeBlocks_wx30.cbp b/src/CodeBlocks_wx30.cbp
index e25bb3c..9fd17fa 100644
--- a/src/CodeBlocks_wx30.cbp
+++ b/src/CodeBlocks_wx30.cbp
@@ -707,7 +707,7 @@
</Build>
<VirtualTargets>
<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
- <Add alias="Core app &amp; plugins" targets="sdk;src;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
+ <Add alias="Core app &amp; plugins" targets="sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;Compiler depslib;" />
</VirtualTargets>
<Compiler>
diff --git a/src/CodeBlocks_wx30_64.cbp b/src/CodeBlocks_wx30_64.cbp
index a860537..5082be3 100644
--- a/src/CodeBlocks_wx30_64.cbp
+++ b/src/CodeBlocks_wx30_64.cbp
@@ -706,7 +706,7 @@
</Build>
<VirtualTargets>
<Add alias="All" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
- <Add alias="Core app &amp; plugins" targets="sdk;src;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
+ <Add alias="Core app &amp; plugins" targets="sdk;src;Abbreviations;AStyle;Autosave;Compiler depslib;Compiler;Debugger;Code-completion;Class wizard;Default MIME handler;Occurrences Highlighting;Open files list;Projects-workspaces importer;Scripted wizard;To-do;XP look &amp; feel;" />
<Add alias="Third-party libs" targets="tinyXML;AutoRevision;ConsoleRunner;Squirrel;Squirrel std lib;SqPlus;scintilla;Compiler depslib;" />
</VirtualTargets>
<Compiler>
--
2.7.0.windows.1


0002-wxContribItems-Removed-unneeded-search-directories-a.patch

Code Select Expand


From f72387bc4dd4fe34e3014b8b9089552fd6717ffd Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Tue, 1 Dec 2015 12:22:52 -0500
Subject: [PATCH 2/2] - wxContribItems: Removed unneeded search directories and
libs. (Thanks stahta01)

Removed wxpropgrid library.
Removed library search directory devel*.
Removed project level include search directory of "wxFlatNotebook/include".
---
src/plugins/contrib/wxContribItems/wxContribItems.cbp         | 3 ---
src/plugins/contrib/wxContribItems/wxContribItems_wx30.cbp    | 2 --
src/plugins/contrib/wxContribItems/wxContribItems_wx30_64.cbp | 2 --
3 files changed, 7 deletions(-)

diff --git a/src/plugins/contrib/wxContribItems/wxContribItems.cbp b/src/plugins/contrib/wxContribItems/wxContribItems.cbp
index 8029710..3616678 100644
--- a/src/plugins/contrib/wxContribItems/wxContribItems.cbp
+++ b/src/plugins/contrib/wxContribItems/wxContribItems.cbp
@@ -157,14 +157,11 @@
<Add option="-DwxUSE_UNICODE" />
<Add directory="$(#wx.include)" />
<Add directory="$(#wx.lib)/gcc_dll$(WX_CFG)/msw$(WX_SUFFIX)" />
- <Add directory="wxFlatNotebook/include" />
</Compiler>
<Linker>
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
- <Add library="wxpropgrid" />
<Add library="wxmsw28$(WX_SUFFIX)" />
- <Add directory="../../../devel" />
<Add directory="$(#wx.lib)/gcc_dll$(WX_CFG)" />
</Linker>
<Unit filename="KWIC/include/wx/KWIC/AngularMeter.h">
diff --git a/src/plugins/contrib/wxContribItems/wxContribItems_wx30.cbp b/src/plugins/contrib/wxContribItems/wxContribItems_wx30.cbp
index d3a9ab5..9c0a33f 100644
--- a/src/plugins/contrib/wxContribItems/wxContribItems_wx30.cbp
+++ b/src/plugins/contrib/wxContribItems/wxContribItems_wx30.cbp
@@ -146,13 +146,11 @@
<Add option="-DwxUSE_UNICODE" />
<Add directory="$(#WX30.include)" />
<Add directory="$(#WX30.lib)/gcc_dll$(WX_CFG)/msw$(WX_SUFFIX)" />
- <Add directory="wxFlatNotebook/include" />
</Compiler>
<Linker>
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
- <Add directory="../../../devel30" />
<Add directory="$(#WX30.lib)/gcc_dll$(WX_CFG)" />
</Linker>
<Unit filename="KWIC/include/wx/KWIC/AngularMeter.h">
diff --git a/src/plugins/contrib/wxContribItems/wxContribItems_wx30_64.cbp b/src/plugins/contrib/wxContribItems/wxContribItems_wx30_64.cbp
index e1f5b29..bfe9fca 100644
--- a/src/plugins/contrib/wxContribItems/wxContribItems_wx30_64.cbp
+++ b/src/plugins/contrib/wxContribItems/wxContribItems_wx30_64.cbp
@@ -147,13 +147,11 @@
<Add option="-DwxUSE_UNICODE" />
<Add directory="$(#WX30_64.include)" />
<Add directory="$(#WX30_64.lib)/gcc_dll$(WX_CFG)/msw$(WX_SUFFIX)" />
- <Add directory="wxFlatNotebook/include" />
</Compiler>
<Linker>
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
- <Add directory="../../../devel30_64" />
<Add directory="$(#WX30_64.lib)/gcc_dll$(WX_CFG)" />
</Linker>
<Unit filename="KWIC/include/wx/KWIC/AngularMeter.h">
--
2.7.0.windows.1


Tim S.

[MortenMacFly]

OK with me && committed. Thank you!