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:
		@@ -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;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswud;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -136,7 +136,7 @@
 | 
			
		||||
				Name="VCWebServiceProxyGeneratorTool"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCIDLTool"
 | 
			
		||||
				Name="VCMIDLTool"
 | 
			
		||||
				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswu;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -172,7 +172,7 @@
 | 
			
		||||
				AdditionalOptions=""
 | 
			
		||||
				AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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\zip.exe"
 | 
			
		||||
				LinkIncremental="2"
 | 
			
		||||
				LinkIncremental="1"
 | 
			
		||||
				SuppressStartupBanner="true"
 | 
			
		||||
				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
 | 
			
		||||
				GenerateManifest="true"
 | 
			
		||||
@@ -180,6 +180,8 @@
 | 
			
		||||
				ProgramDatabaseFile="vc_mswu\zip.pdb"
 | 
			
		||||
				SubSystem="2"
 | 
			
		||||
				TargetMachine="1"
 | 
			
		||||
				OptimizeReferences="2"
 | 
			
		||||
				EnableCOMDATFolding="2"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCALinkTool"
 | 
			
		||||
@@ -227,7 +229,7 @@
 | 
			
		||||
				Name="VCWebServiceProxyGeneratorTool"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCIDLTool"
 | 
			
		||||
				Name="VCMIDLTool"
 | 
			
		||||
				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -320,7 +322,7 @@
 | 
			
		||||
				Name="VCWebServiceProxyGeneratorTool"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCIDLTool"
 | 
			
		||||
				Name="VCMIDLTool"
 | 
			
		||||
				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_lib\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -356,7 +358,7 @@
 | 
			
		||||
				AdditionalOptions=""
 | 
			
		||||
				AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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\zip.exe"
 | 
			
		||||
				LinkIncremental="2"
 | 
			
		||||
				LinkIncremental="1"
 | 
			
		||||
				SuppressStartupBanner="true"
 | 
			
		||||
				AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib"
 | 
			
		||||
				GenerateManifest="true"
 | 
			
		||||
@@ -364,6 +366,8 @@
 | 
			
		||||
				ProgramDatabaseFile="vc_mswunivu\zip.pdb"
 | 
			
		||||
				SubSystem="2"
 | 
			
		||||
				TargetMachine="1"
 | 
			
		||||
				OptimizeReferences="2"
 | 
			
		||||
				EnableCOMDATFolding="2"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCALinkTool"
 | 
			
		||||
@@ -411,7 +415,7 @@
 | 
			
		||||
				Name="VCWebServiceProxyGeneratorTool"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCIDLTool"
 | 
			
		||||
				Name="VCMIDLTool"
 | 
			
		||||
				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswud;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -504,7 +508,7 @@
 | 
			
		||||
				Name="VCWebServiceProxyGeneratorTool"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCIDLTool"
 | 
			
		||||
				Name="VCMIDLTool"
 | 
			
		||||
				PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswu;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -540,7 +544,7 @@
 | 
			
		||||
				AdditionalOptions=""
 | 
			
		||||
				AdditionalDependencies="wxmsw29u_html.lib  wxmsw29u_core.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\zip.exe"
 | 
			
		||||
				LinkIncremental="2"
 | 
			
		||||
				LinkIncremental="1"
 | 
			
		||||
				SuppressStartupBanner="true"
 | 
			
		||||
				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
 | 
			
		||||
				GenerateManifest="true"
 | 
			
		||||
@@ -548,6 +552,8 @@
 | 
			
		||||
				ProgramDatabaseFile="vc_mswudll\zip.pdb"
 | 
			
		||||
				SubSystem="2"
 | 
			
		||||
				TargetMachine="1"
 | 
			
		||||
				OptimizeReferences="2"
 | 
			
		||||
				EnableCOMDATFolding="2"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCALinkTool"
 | 
			
		||||
@@ -595,7 +601,7 @@
 | 
			
		||||
				Name="VCWebServiceProxyGeneratorTool"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCIDLTool"
 | 
			
		||||
				Name="VCMIDLTool"
 | 
			
		||||
				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivud;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -688,7 +694,7 @@
 | 
			
		||||
				Name="VCWebServiceProxyGeneratorTool"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCIDLTool"
 | 
			
		||||
				Name="VCMIDLTool"
 | 
			
		||||
				PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
 | 
			
		||||
				AdditionalIncludeDirectories=".\..\..\..\lib\vc_dll\mswunivu;.\..\..\..\include;.;.\..\..\..\samples"
 | 
			
		||||
			/>
 | 
			
		||||
@@ -724,7 +730,7 @@
 | 
			
		||||
				AdditionalOptions=""
 | 
			
		||||
				AdditionalDependencies="wxmswuniv29u_html.lib  wxmswuniv29u_core.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\zip.exe"
 | 
			
		||||
				LinkIncremental="2"
 | 
			
		||||
				LinkIncremental="1"
 | 
			
		||||
				SuppressStartupBanner="true"
 | 
			
		||||
				AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll"
 | 
			
		||||
				GenerateManifest="true"
 | 
			
		||||
@@ -732,6 +738,8 @@
 | 
			
		||||
				ProgramDatabaseFile="vc_mswunivudll\zip.pdb"
 | 
			
		||||
				SubSystem="2"
 | 
			
		||||
				TargetMachine="1"
 | 
			
		||||
				OptimizeReferences="2"
 | 
			
		||||
				EnableCOMDATFolding="2"
 | 
			
		||||
			/>
 | 
			
		||||
			<Tool
 | 
			
		||||
				Name="VCALinkTool"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user