Rebake everything using bakefile 0.2.7.

Also updated aclocal inputs and regenerated configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-22 16:53:10 +00:00
parent 124a5e3e6a
commit 7880889720
1161 changed files with 124960 additions and 119042 deletions

View File

@@ -2,7 +2,7 @@
<!--
This project was generated by
Bakefile 0.2.6 (http://www.bakefile.org)
Bakefile 0.2.7 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -43,7 +43,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"
/>
@@ -139,7 +139,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"
/>
@@ -178,7 +178,7 @@
AdditionalOptions=""
AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\test_gui.exe"
LinkIncremental="2"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\lib\vc_lib"
GenerateManifest="true"
@@ -186,6 +186,8 @@
ProgramDatabaseFile="vc_mswu\test_gui.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
/>
<Tool
Name="VCALinkTool"
@@ -233,7 +235,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"
/>
@@ -329,7 +331,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"
/>
@@ -368,7 +370,7 @@
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivu\test_gui.exe"
LinkIncremental="2"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\lib\vc_lib"
GenerateManifest="true"
@@ -376,6 +378,8 @@
ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
/>
<Tool
Name="VCALinkTool"
@@ -423,7 +427,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"
/>
@@ -519,7 +523,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"
/>
@@ -558,7 +562,7 @@
AdditionalOptions=""
AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\test_gui.exe"
LinkIncremental="2"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\lib\vc_dll"
GenerateManifest="true"
@@ -566,6 +570,8 @@
ProgramDatabaseFile="vc_mswudll\test_gui.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
/>
<Tool
Name="VCALinkTool"
@@ -613,7 +619,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"
/>
@@ -709,7 +715,7 @@
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCIDLTool"
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"
/>
@@ -748,7 +754,7 @@
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivudll\test_gui.exe"
LinkIncremental="2"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\lib\vc_dll"
GenerateManifest="true"
@@ -756,6 +762,8 @@
ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
/>
<Tool
Name="VCALinkTool"
@@ -800,10 +808,10 @@
>
</File>
<File
RelativePath=".\graphics\colour.cpp"
>
</File>
<File
RelativePath=".\graphics\colour.cpp"
>
</File>
<File
RelativePath=".\controls\comboboxtest.cpp"
>
</File>