<!--\r
\r
This project was generated by\r
- Bakefile 0.2.6 (http://www.bakefile.org)\r
+ Bakefile 0.2.8 (http://www.bakefile.org)\r
Do not modify, all changes will be overwritten!\r
\r
-->\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
SuppressStartupBanner="TRUE"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
SuppressStartupBanner="TRUE"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
Culture="1033"\r
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\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_mswuddll\wxprec_xrcdll.pch"\r
ObjectFile="vc_mswuddll\xrc\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_xrc_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_xrc_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_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"\r
- OutputFile="..\..\lib\vc_dll\wxmsw291ud_xrc_vc_custom.dll"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw292ud_xrc_vc_custom.dll"\r
LinkIncremental="2"\r
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_xrc_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_xrc_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=wxmsw291ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"\r
ObjectFile="vc_mswudll\xrc\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_xrc_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_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"\r
- OutputFile="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.dll"\r
- LinkIncremental="2"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.dll"\r
+ LinkIncremental="1"\r
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_xrc_vc_custom.pdb"\r
- TargetMachine="1"/>\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_xrc_vc_custom.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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_xrcdll.pch"\r
ObjectFile="vc_mswunivuddll\xrc\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_xrc_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_xrc_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_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"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_xrc_vc_custom.dll"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_vc_custom.dll"\r
LinkIncremental="2"\r
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_xrc_vc_custom.pdb"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_xrc_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=wxmswuniv291ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"\r
ObjectFile="vc_mswunivudll\xrc\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_xrc_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_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"\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.dll"\r
- LinkIncremental="2"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.dll"\r
+ LinkIncremental="1"\r
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_xrc_vc_custom.pdb"\r
- TargetMachine="1"/>\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_xrc_vc_custom.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\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="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
<File\r
RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_collpane.h">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_toolbk.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
</File>\r
<File\r
RelativePath="..\..\src\xrc\xh_clrpicker.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_cmdlinkbn.cpp">\r
+ </File>\r
<File\r
RelativePath="..\..\src\xrc\xh_collpane.cpp">\r
</File>\r
<File\r
RelativePath="..\..\src\xrc\xh_toolb.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_toolbk.cpp">\r
+ </File>\r
<File\r
RelativePath="..\..\src\xrc\xh_tree.cpp">\r
</File>\r