Patch #1423 2006-08-28 17:47

mortis

Adds WX_CFG to contrib-plugins' projectfiles
Download
1423-Adds_WX_CFG_to.patch (2.5 KB)
Category
Plugin::Refinement
Status
Closed
Close date
2006-10-10 12:23
Assigned to
 
Index: src/plugins/contrib/byogames/byogames.cbp

===================================================================

--- src/plugins/contrib/byogames/byogames.cbp    (revision 2916)

+++ src/plugins/contrib/byogames/byogames.cbp    (working copy)

@@ -14,6 +14,7 @@

             </Target>
             <Environment>
                 <Variable name="WX_SUFFIX" value="u" />
+                <Variable name="WX_CFG" value="" />
             </Environment>
         </Build>
         <VirtualTargets>
@@ -37,7 +38,7 @@

             <Add option="-DwxUSE_UNICODE" />
             <Add option="-DBUILDING_PLUGIN" />
             <Add directory="$(#WX.include)" />
-            <Add directory="$(#WX.lib)\gcc_dll\msw$(WX_SUFFIX)" />
+            <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
             <Add directory="$(#WX)\contrib\include" />
             <Add directory="$(#CB.include)" />
             <Add directory="$(#CB.include)\tinyxml" />
@@ -53,7 +54,7 @@

         <Linker>
             <Add library="wxmsw26$(WX_SUFFIX)" />
             <Add library="codeblocks" />
-            <Add directory="$(#WX.lib)\gcc_dll" />
+            <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)" />
             <Add directory="$(#CB.lib)" />
             <Add directory="$(#CB)\devel" />
             <Add directory="$(#CB)\sdk\tinyxml" />
Index: src/plugins/contrib/codesnippets/codesnippets.cbp

===================================================================

--- src/plugins/contrib/codesnippets/codesnippets.cbp    (revision 2916)

+++ src/plugins/contrib/codesnippets/codesnippets.cbp    (working copy)

@@ -51,7 +51,6 @@

             <Add directory="$(#cb)\sdk" />
             <Add directory="$(#cb)\sdk\wxscintilla\include" />
             <Add directory="$(#wx.include)" />
-            <Add directory="$(#wx.lib)\gcc_dll\mswu" />
             <Add directory="$(#wx.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
         </Compiler>
         <Linker>
@@ -61,7 +60,6 @@

             <Add library="codeblocks" />
             <Add directory="$(#cb)\devel" />
             <Add directory="$(#cb)\sdk\tinyxml" />
-            <Add directory="$(#wx.lib)\gcc_dll" />
             <Add directory="$(#wx.lib)\gcc_dll$(WX_CFG)" />
         </Linker>
         <ExtraCommands>
Index: src/plugins/contrib/keybinder/keybinder.cbp

===================================================================

--- src/plugins/contrib/keybinder/keybinder.cbp    (revision 2916)

+++ src/plugins/contrib/keybinder/keybinder.cbp    (working copy)

@@ -52,7 +52,7 @@

             <Add library="wxmsw26$(WX_SUFFIX)" />
             <Add directory="$(#CB)\devel" />
             <Add directory="$(#CB.lib)" />
-            <Add directory="$(#WX.lib)\gcc_dll" />
+            <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)" />
         </Linker>
         <Unit filename="cbkeybinder.cpp">
             <Option compilerVar="CPP" />

History

mortis 2006-08-28 17:53

Adds $(WX_CFG) to the include and linker directory lists of plugins/contrib/byogames and plugins/contrib/keybinder.

Secondly it adds WX_CFG to the list of environment variables of plugins/contrib/byogames.

Thirdly plugins/contrib/codesnippets contains one path with and one without $(WX_CFG) for both the include and linker directories. Because the one without $(WX_CFG) is the first in the list it would cause that directory to be used (instead of the one intended by the user). So I've simply removed those two entries.

killerbot 2006-10-10 12:23

applied

svn 3058