Tim's Build related patches

[stahta01]

This thread is for some Code::Blocks build related patches.
The plan is to make only minor change the real source code files like *.c, *.h, or *.cpp.

Mainly patches to *.cbp and Makefile.am files.

This message will also be updated as an index to all the patches.

Tim S.

[stahta01]

NOTE: This patch IS NOT a patch worth committing to the SVN tree.

Patch to CB task exchndl to enable direct linking to libintl3.dll from GnuWin32.
http://gnuwin32.sourceforge.net/packages/libintl.htm

Just copy the DLL, from the "Binaries" zip bin folder, to the devel and build the task exchndl.

Note: Patch currently only patches CodeBlocks_wx29.cbp CB Project.

Tim S.

Code Select Expand


Index: src/CodeBlocks_wx29.cbp
===================================================================
--- src/CodeBlocks_wx29.cbp (revision 7398)
+++ src/CodeBlocks_wx29.cbp (working copy)
@@ -19,7 +19,7 @@
<Linker>
<Add library="bfd" />
<Add library="iberty" />
- <Add library="intl" />
+ <Add library="devel\libintl3.dll" />
<Add directory="base\exchndl\lib" />
</Linker>
</Target>


[stahta01]

NOTE: This patch MIGHT be worth committing to the SVN tree; but, needs more testing.

Patch to reduce the number of places in the CB core project where the monolithic DLL name is used.

Tim S.

Code Select Expand


Index: src/CodeBlocks_wx29.cbp
===================================================================
--- src/CodeBlocks_wx29.cbp (revision 7398)
+++ src/CodeBlocks_wx29.cbp (working copy)
@@ -214,7 +214,7 @@
<Option working_dir="devel\share\CodeBlocks\plugins" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -230,7 +230,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -240,7 +239,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -254,7 +253,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -264,7 +262,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -277,7 +275,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -299,7 +297,7 @@
<Option external_deps="devel\libcodeblocks.a;plugins\compilergcc\depslib\libdepslib.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -315,7 +312,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add library="depslib" />
<Add directory="devel" />
<Add directory="plugins\compilergcc\depslib" />
@@ -327,7 +324,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -342,7 +339,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -352,7 +348,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -366,7 +362,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -376,7 +371,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -389,7 +384,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -399,7 +393,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -412,7 +406,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -422,7 +415,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -435,7 +428,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -445,7 +437,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -459,7 +451,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -469,7 +460,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -484,7 +475,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -494,7 +484,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -508,7 +498,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -518,7 +507,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -531,7 +520,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
Index: src/CodeBlocks.cbp
===================================================================
--- src/CodeBlocks.cbp (revision 7398)
+++ src/CodeBlocks.cbp (working copy)
@@ -240,7 +240,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -256,7 +256,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -266,7 +265,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -280,7 +279,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -290,7 +288,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -303,7 +301,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -325,7 +322,7 @@
<Option external_deps="devel\libcodeblocks.a;plugins\compilergcc\depslib\libdepslib.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -341,7 +339,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add library="depslib" />
<Add directory="devel" />
<Add directory="plugins\compilergcc\depslib" />
@@ -353,7 +350,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -368,7 +365,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -378,7 +374,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -392,7 +388,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -402,7 +397,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -415,7 +410,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -425,7 +419,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -438,7 +432,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -448,7 +441,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -461,7 +454,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -471,7 +463,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -485,7 +477,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -495,7 +486,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -510,7 +501,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -520,7 +510,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -534,7 +524,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>
@@ -544,7 +533,7 @@
<Option external_deps="devel\libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
- <Option projectLinkerOptionsRelation="1" />
+ <Option projectLinkerOptionsRelation="2" />
<Compiler>
<Add option="-DBUILDING_PLUGIN" />
<Add option="-DWXMAKINGDLL_PROPGRID" />
@@ -557,7 +545,6 @@
<Add option="-Wl,--enable-auto-import" />
<Add option="-mthreads" />
<Add library="codeblocks" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="devel" />
</Linker>
</Target>


[stahta01]

NOTE: This patch IS NOT a patch worth committing to the SVN tree.

Patch to change CB core project from using the wxWidgets monolithic DLL to using wxWidgets Mult-Libs.

REQUIRES: The prior patch to be applied!!

Code Select Expand


Index: src/CodeBlocks_wx29.cbp
===================================================================
--- src/CodeBlocks_wx29.cbp (revision 7398)
+++ src/CodeBlocks_wx29.cbp (working copy)
@@ -575,7 +575,15 @@
</ResourceCompiler>
<Linker>
<Add option="-mthreads" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_propgrid" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_xrc" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_adv" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_html" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_aui" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_core" />
+ <Add library="wxbase$(WX_VERSION)$(WX_SUFFIX)_xml" />
+ <Add library="wxbase$(WX_VERSION)$(WX_SUFFIX)_net" />
+ <Add library="wxbase$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="base\tinyxml" />
<Add directory="$(#WX29.lib)\gcc_dll$(WX_CFG)" />
</Linker>
Index: src/CodeBlocks.cbp
===================================================================
--- src/CodeBlocks.cbp (revision 7398)
+++ src/CodeBlocks.cbp (working copy)
@@ -601,7 +601,14 @@
</ResourceCompiler>
<Linker>
<Add option="-mthreads" />
- <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_xrc" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_adv" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_html" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_aui" />
+ <Add library="wxmsw$(WX_VERSION)$(WX_SUFFIX)_core" />
+ <Add library="wxbase$(WX_VERSION)$(WX_SUFFIX)_xml" />
+ <Add library="wxbase$(WX_VERSION)$(WX_SUFFIX)_net" />
+ <Add library="wxbase$(WX_VERSION)$(WX_SUFFIX)" />
<Add directory="base\tinyxml" />
<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)" />
</Linker>


[ironhead]

NOTE: This patch IS NOT a patch worth committing to the SVN tree.

Patch to change CB core project from using the wxWidgets monolithic DLL to using wxWidgets Mult-Libs.

I was maintaining a separate set of project files (for both CB core as well as all the contrib plugins), but it because tiresome to do so everytime there was a change to the project files in svn.  Personally I wouldn't mind it being committed, but I realize it will break the existing mode of compiling and distributing a monolithic wxWidgets DLL.  It does, however, have the advantage of working with a non-patched gcc.

[stahta01]

NOTE: This patch IS NOT a patch worth committing to the SVN tree.

Patch to change CB core project from using the wxWidgets monolithic DLL to using wxWidgets Mult-Libs.

I was maintaining a separate set of project files (for both CB core as well as all the contrib plugins), but it because tiresome to do so everytime there was a change to the project files in svn.  Personally I wouldn't mind it being committed, but I realize it will break the existing mode of compiling and distributing a monolithic wxWidgets DLL.  It does, however, have the advantage of working with a non-patched gcc.

The prereq patch is the hard one to maintain.
http://forums.next.codeblocks.org/index.php/topic,15154.msg101617.html#msg101617
I consider it worth applying it just needs more testing.

Tim S.