<?xml version="1.0" encoding="Windows-1252"?>\r
<!--\r
\r
- This makefile was generated by\r
- Bakefile 0.2.5 (http://www.bakefile.org)\r
+ This project was generated by\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="0"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
BasicRuntimeChecks="3"\r
TargetMachine="1"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
AdditionalOptions=""\r
AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.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"\r
OutputFile="vc_mswu\test_gui.exe"\r
- LinkIncremental="2"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
BasicRuntimeChecks="3"\r
TargetMachine="1"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
AdditionalOptions=""\r
AdditionalDependencies="wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.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"\r
OutputFile="vc_mswunivu\test_gui.exe"\r
- LinkIncremental="2"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
BasicRuntimeChecks="3"\r
TargetMachine="1"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
AdditionalOptions=""\r
AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.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"\r
OutputFile="vc_mswudll\test_gui.exe"\r
- LinkIncremental="2"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
BasicRuntimeChecks="3"\r
TargetMachine="1"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
AdditionalOptions=""\r
AdditionalDependencies="wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.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"\r
OutputFile="vc_mswunivudll\test_gui.exe"\r
- LinkIncremental="2"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
Name="VCMIDLTool"\r
- PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"/>\r
<Tool\r
Name="Source Files"\r
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+ <File\r
+ RelativePath=".\graphics\bitmap.cpp">\r
+ </File>\r
+ <File\r
+ RelativePath=".\sizers\boxsizer.cpp">\r
+ </File>\r
<File\r
RelativePath=".\window\clientsize.cpp">\r
</File>\r
<File\r
RelativePath=".\events\clone.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\graphics\colour.cpp">\r
+ </File>\r
<File\r
RelativePath=".\controls\comboboxtest.cpp">\r
</File>\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
</File>\r
+ <File\r
+ RelativePath=".\graphics\ellipsization.cpp">\r
+ </File>\r
<File\r
RelativePath=".\font\fonttest.cpp">\r
</File>\r
<File\r
RelativePath=".\html\htmlwindow.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\image\image.cpp">\r
+ </File>\r
+ <File\r
+ RelativePath=".\controls\label.cpp">\r
+ </File>\r
<File\r
RelativePath=".\controls\listctrltest.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\graphics\measuring.cpp">\r
+ </File>\r
<File\r
RelativePath=".\geometry\point.cpp">\r
</File>\r
<File\r
RelativePath=".\window\setsize.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\misc\settings.cpp">\r
+ </File>\r
<File\r
RelativePath=".\geometry\size.cpp">\r
</File>\r