X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4689441b050787afee8b9113ca1ea574e551cb77..ad410224a387bcc217bedb4043e6b0b9614ed57c:/build/msw/wx_vc7_xrc.vcproj diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj index 46086d21d9..b623b4a361 100644 --- a/build/msw/wx_vc7_xrc.vcproj +++ b/build/msw/wx_vc7_xrc.vcproj @@ -2,7 +2,7 @@ <!-- This project was generated by - Bakefile 0.2.8 (http://www.bakefile.org) + Bakefile 0.2.9 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> @@ -273,7 +273,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -284,13 +284,13 @@ 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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -304,7 +304,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool @@ -338,7 +338,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch" ObjectFile="vc_mswudll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -349,13 +349,13 @@ 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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2"/> @@ -371,7 +371,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool @@ -408,7 +408,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswunivuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -419,13 +419,13 @@ 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb" TargetMachine="1"/> <Tool Name="VCMIDLTool" @@ -439,7 +439,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool @@ -473,7 +473,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch" ObjectFile="vc_mswunivudll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -484,13 +484,13 @@ 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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2"/> @@ -506,7 +506,7 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/> <Tool @@ -610,8 +610,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswud\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> @@ -619,8 +618,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswu\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="Universal Debug|Win32"/> @@ -632,8 +630,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswud\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="DLL Release|Win32"> @@ -641,8 +638,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswu\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="DLL Universal Debug|Win32"/> @@ -661,8 +657,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="Universal Release|Win32"> @@ -670,8 +665,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="DLL Debug|Win32"/> @@ -683,8 +677,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/> </FileConfiguration> <FileConfiguration Name="DLL Universal Release|Win32"> @@ -692,8 +685,7 @@ Name="VCCustomBuildTool" Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h" CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h" - AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/> + Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/> </FileConfiguration> </File> </Filter> @@ -785,6 +777,9 @@ <File RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"> </File> + <File + RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"> + </File> <File RelativePath="..\..\include\wx\xrc\xh_bmp.h"> </File> @@ -945,6 +940,9 @@ RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"> </File> <File + RelativePath="..\..\include\wx\xrc\xh_timectrl.h"> + </File> + <File RelativePath="..\..\include\wx\xrc\xh_toolb.h"> </File> <File @@ -973,6 +971,9 @@ <File RelativePath="..\..\src\xrc\xh_animatctrl.cpp"> </File> + <File + RelativePath="..\..\src\xrc\xh_bannerwindow.cpp"> + </File> <File RelativePath="..\..\src\xrc\xh_bmp.cpp"> </File> @@ -1133,6 +1134,9 @@ RelativePath="..\..\src\xrc\xh_tglbtn.cpp"> </File> <File + RelativePath="..\..\src\xrc\xh_timectrl.cpp"> + </File> + <File RelativePath="..\..\src\xrc\xh_toolb.cpp"> </File> <File