Patch #1884 2007-02-13 17:57

stahta01

Updated ANSI build patch file ANSI_BUILD_cb-projectfiles.pat
Download
1884-Updated_ANSI_b.patch (13.6 KB)
Category
Application::Refinement
Status
Closed
Close date
2007-02-19 03:53
Assigned to
 
Index: CodeBlocks.cbp
===================================================================
--- CodeBlocks.cbp    (revision 3601)
+++ CodeBlocks.cbp    (working copy)
@@ -447,7 +447,7 @@
                 </Linker>
             </Target>
             <Environment>
-                <Variable name="WX_SUFFIX" value="u" />
+               <Variable name="WX_SUFFIX" value="" />
                 <Variable name="WX_CFG" value="" />
             </Environment>
         </Build>
@@ -471,7 +471,6 @@
             <Add option="-DTIXML_USE_STL" />
             <Add option="-DCB_PRECOMP" />
             <Add option="-DWX_PRECOMP" />
-            <Add option="-DwxUSE_UNICODE" />
             <Add directory="$(#WX.include)" />
             <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
             <Add directory="include\wxscintilla\include" />
Index: plugins/contrib/byogames/byogames.cbp
===================================================================
--- plugins/contrib/byogames/byogames.cbp    (revision 3601)
+++ plugins/contrib/byogames/byogames.cbp    (working copy)
@@ -12,7 +12,7 @@
                 <Option host_application="..\..\..\devel\codeblocks.exe" />
             </Target>
             <Environment>
-                <Variable name="WX_SUFFIX" value="u" />
+                <Variable name="WX_SUFFIX" value="" />
                 <Variable name="WX_CFG" value="" />
             </Environment>
         </Build>
@@ -34,7 +34,6 @@
             <Add option="-DWXUSINGDLL" />
             <Add option="-DTIXML_USE_STL" />
             <Add option="-DWX_PRECOMP" />
-            <Add option="-DwxUSE_UNICODE" />
             <Add option="-DBUILDING_PLUGIN" />
             <Add directory="$(#WX.include)" />
             <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
Index: plugins/contrib/cb_koders/cb_koders.cbp
===================================================================
--- plugins/contrib/cb_koders/cb_koders.cbp    (revision 3601)
+++ plugins/contrib/cb_koders/cb_koders.cbp    (working copy)
@@ -16,7 +16,7 @@
                 <Option projectResourceIncludeDirsRelation="0" />
             </Target>
             <Environment>
-                <Variable name="WX_SUFFIX" value="u" />
+                <Variable name="WX_SUFFIX" value="" />
                 <Variable name="WX_CFG" value="" />
             </Environment>
         </Build>
@@ -38,7 +38,6 @@
             <Add option="-DWXUSINGDLL" />
             <Add option="-DTIXML_USE_STL" />
             <Add option="-DWX_PRECOMP" />
-            <Add option="-DwxUSE_UNICODE" />
             <Add option="-DBUILDING_PLUGIN" />
             <Add directory="$(#WX.include)" />
             <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
Index: plugins/contrib/codesnippets/codesnippets.cbp
===================================================================
--- plugins/contrib/codesnippets/codesnippets.cbp    (revision 3601)
+++ plugins/contrib/codesnippets/codesnippets.cbp    (working copy)
@@ -24,7 +24,7 @@
                 <Option compiler="gcc" />
             </Target>
             <Environment>
-                <Variable name="WX_SUFFIX" value="u" />
+                <Variable name="WX_SUFFIX" value="" />
                 <Variable name="WX_CFG" value="" />
             </Environment>
         </Build>
@@ -46,7 +46,6 @@
             <Add option="-DcbDEBUG" />
             <Add option="-DCB_PRECOMP" />
             <Add option="-DWX_PRECOMP" />
-            <Add option="-DwxUSE_UNICODE" />
             <Add directory="$(#cb.include)" />
            <Add directory="$(#cb.include)\\wxscintilla\include" />
             <Add directory="$(#wx.include)" />
Index: plugins/contrib/codestat/codestat.cbp
===================================================================
--- plugins/contrib/codestat/codestat.cbp    (revision 3601)
+++ plugins/contrib/codestat/codestat.cbp    (working copy)
@@ -14,7 +14,7 @@
                 <Option projectCompilerOptionsRelation="0" />
             </Target>
             <Environment>
-                <Variable name="WX_SUFFIX" value="u" />
+                <Variable name="WX_SUFFIX" value="" />
                 <Variable name="WX_CFG" value="" />
             </Environment>
         </Build>
@@ -36,7 +36,6 @@
             <Add option="-DWXUSINGDLL" />
             <Add option="-DcbDEBUG" />
             <Add option="-DTIXML_USE_STL" />
-            <Add option="-DwxUSE_UNICODE" />
             <Add directory="$(#CB.INCLUDE)" />
             <Add directory="$(#CB.INCLUDE)\wxscintilla\include" />
             <Add directory="$(#WX.INCLUDE)" />
Index: plugins/contrib/copystrings/copystrings.cbp
===================================================================
--- plugins/contrib/copystrings/copystrings.cbp    (revision 3601)
+++ plugins/contrib/copystrings/copystrings.cbp    (working copy)
@@ -11,7 +11,7 @@
                 <Option compiler="gcc" />
             </Target>
             <Environm
download for full patch...
stahta01 2007-02-13 17:59

This file needs commit to SVN, it does NOT need to be applied to SVN. It is updated for the new file layout.

It a new version of file src/ANSI_BUILD_cb-projectfiles.patch.

Tim S

stahta01 2007-02-18 04:37

Please close this patch, I have created an sed script that solves the issue in a better way. It is posted in this message

http://forums.codeblocks.org/index.php?topic=5199.msg40564#msg40564

Tim S