X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a158acac6d488f58e5afc7c0ce51908a8ce6f25d..a91a64da8ec5aa3916d06e77875d8ae5e13cfd9f:/build/msw/wx_vc9_core.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index ac6fb0b636..66d8344aef 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2,7 +2,7 @@
 <!--
 
   This makefile was generated by
-  Bakefile 0.2.4 (http://www.bakefile.org)
+  Bakefile 0.2.5 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -54,7 +54,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
 				AssemblerListingLocation="vc_mswunivudll\core\"
@@ -79,7 +79,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"
+				AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
@@ -146,7 +146,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
 				AssemblerListingLocation="vc_mswunivuddll\core\"
@@ -171,7 +171,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.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 ..\..\lib\vc_dll\wxbase29ud.lib"
+				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.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 ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
@@ -236,7 +236,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
 				AssemblerListingLocation="vc_mswudll\core\"
@@ -261,7 +261,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"
+				AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
@@ -328,7 +328,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
 				AssemblerListingLocation="vc_mswuddll\core\"
@@ -353,7 +353,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.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 ..\..\lib\vc_dll\wxbase29ud.lib"
+				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.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 ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
@@ -418,7 +418,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
 				AssemblerListingLocation="vc_mswunivu\core\"
@@ -501,7 +501,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
 				AssemblerListingLocation="vc_mswunivud\core\"
@@ -582,7 +582,7 @@
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
 				AssemblerListingLocation="vc_mswu\core\"
@@ -665,7 +665,7 @@
 				RuntimeLibrary="3"
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
 				AssemblerListingLocation="vc_mswud\core\"
@@ -998,6 +998,14 @@
 				RelativePath="..\..\src\common\graphcmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\headercolcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\headerctrlcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\helpbase.cpp"
 				>
@@ -1114,6 +1122,10 @@
 				RelativePath="..\..\src\common\radiocmn.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\rearrangectrl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\rendcmn.cpp"
 				>
@@ -1130,6 +1142,14 @@
 				RelativePath="..\..\src\common\sizer.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\spinbuttcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\spinctrlcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\srchcmn.cpp"
 				>
@@ -1243,6 +1263,26 @@
 					ExcludedFromBuild="true"
 				/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\ole\activex.cpp"
+				>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp"
 				>
@@ -1719,6 +1759,26 @@
 				RelativePath="..\..\src\msw\graphics.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\headerctrl.cpp"
+				>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\helpchm.cpp"
 				>
@@ -2243,26 +2303,6 @@
 					ExcludedFromBuild="true"
 				/>
 			</File>
-			<File
-				RelativePath="..\..\src\msw\tabctrl.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
 			<File
 				RelativePath="..\..\src\msw\textctrl.cpp"
 				>
@@ -2588,6 +2628,10 @@
 				RelativePath="..\..\src\generic\fontpickerg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\generic\headerctrlg.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\listbkg.cpp"
 				>
@@ -2728,26 +2772,6 @@
 					ExcludedFromBuild="true"
 				/>
 			</File>
-			<File
-				RelativePath="..\..\src\generic\tabg.cpp"
-				>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
 			<File
 				RelativePath="..\..\src\generic\textdlgg.cpp"
 				>
@@ -3999,6 +4023,10 @@
 				RelativePath="..\..\include\wx\msw\glcanvas.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\headerctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\helpbest.h"
 				>
@@ -4163,10 +4191,6 @@
 				RelativePath="..\..\include\wx\msw\statusbar.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tabctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h"
 				>
@@ -4328,10 +4352,18 @@
 				RelativePath="..\..\include\wx\generic\gridctrl.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\grideditors.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\gridsel.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\headerctrlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\helpext.h"
 				>
@@ -4428,10 +4460,6 @@
 				RelativePath="..\..\include\wx\generic\statusbr.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\tabg.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\textdlgg.h"
 				>
@@ -5047,6 +5075,14 @@
 				RelativePath="..\..\include\wx\grid.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\headercol.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\headerctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\help.h"
 				>
@@ -5311,6 +5347,10 @@
 				RelativePath="..\..\include\wx\rawbmp.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\rearrangectrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\region.h"
 				>
@@ -5435,14 +5475,6 @@
 				RelativePath="..\..\include\wx\stc\stc.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tab.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tabctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\tabmdi.h"
 				>
@@ -5479,10 +5511,6 @@
 				RelativePath="..\..\include\wx\tipwin.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\tls.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\toolbar.h"
 				>