<!--\r
\r
This project was generated by\r
- Bakefile 0.2.8 (http://www.bakefile.org)\r
+ Bakefile 0.2.9 (http://www.bakefile.org)\r
Do not modify, all changes will be overwritten!\r
\r
-->\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"\r
ObjectFile="vc_mswuddll\ribbon\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
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_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.dll"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.dll"\r
LinkIncremental="2"\r
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_ribbon.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_ribbon_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_ribbon_vc_custom.pdb"\r
TargetMachine="1"/>\r
<Tool\r
Name="VCMIDLTool"\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"\r
ObjectFile="vc_mswudll\ribbon\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
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_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.dll"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.dll"\r
LinkIncremental="1"\r
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_ribbon.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_ribbon_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_ribbon_vc_custom.pdb"\r
TargetMachine="1"\r
OptimizeReferences="2"\r
EnableCOMDATFolding="2"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_ribbondll.pch"\r
ObjectFile="vc_mswunivuddll\ribbon\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
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_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.dll"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.dll"\r
LinkIncremental="2"\r
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_ribbon_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295ud_ribbon_vc_custom.pdb"\r
TargetMachine="1"/>\r
<Tool\r
Name="VCMIDLTool"\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswunivudll\wxprec_ribbondll.pch"\r
ObjectFile="vc_mswunivudll\ribbon\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
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_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.dll"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.dll"\r
LinkIncremental="1"\r
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_ribbon_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_ribbon_vc_custom.pdb"\r
TargetMachine="1"\r
OptimizeReferences="2"\r
EnableCOMDATFolding="2"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
Name="Setup Headers"\r
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}">\r
<File\r
- RelativePath="..\..\include\wx\univ\setup.h">\r
- <FileConfiguration\r
- Name="Debug|Win32"/>\r
- <FileConfiguration\r
- Name="Release|Win32"/>\r
+ RelativePath="..\..\include\wx\msw\setup.h">\r
<FileConfiguration\r
- Name="Universal Debug|Win32">\r
+ Name="Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Release|Win32">\r
+ Name="Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32"/>\r
+ Name="Universal Debug|Win32"/>\r
<FileConfiguration\r
- Name="DLL Release|Win32"/>\r
+ Name="Universal Release|Win32"/>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32">\r
+ Name="DLL Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32">\r
+ Name="DLL Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r
</FileConfiguration>\r
+ <FileConfiguration\r
+ Name="DLL Universal Debug|Win32"/>\r
+ <FileConfiguration\r
+ Name="DLL Universal Release|Win32"/>\r
</File>\r
<File\r
- RelativePath="..\..\include\wx\msw\setup.h">\r
+ RelativePath="..\..\include\wx\univ\setup.h">\r
<FileConfiguration\r
- Name="Debug|Win32">\r
+ Name="Debug|Win32"/>\r
+ <FileConfiguration\r
+ Name="Release|Win32"/>\r
+ <FileConfiguration\r
+ Name="Universal Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32">\r
+ Name="Universal Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32"/>\r
+ Name="DLL Debug|Win32"/>\r
<FileConfiguration\r
- Name="Universal Release|Win32"/>\r
+ Name="DLL Release|Win32"/>\r
<FileConfiguration\r
- Name="DLL Debug|Win32">\r
+ Name="DLL Universal Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32">\r
+ Name="DLL Universal Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL Universal Debug|Win32"/>\r
- <FileConfiguration\r
- Name="DLL Universal Release|Win32"/>\r
</File>\r
</Filter>\r
<Filter\r
<File\r
RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_ribbon.h">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Source Files"\r
<File\r
RelativePath="..\..\src\ribbon\toolbar.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_ribbon.cpp">\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r