<?xml version="1.0" encoding="Windows-1252"?>\r
<!--\r
\r
- This makefile was generated by\r
- Bakefile 0.2.4 (http://www.bakefile.org)\r
+ This project was generated by\r
+ Bakefile 0.2.6 (http://www.bakefile.org)\r
Do not modify, all changes will be overwritten!\r
\r
-->\r
</ToolFiles>\r
<Configurations>\r
<Configuration\r
- Name="DLL Universal Release|Win32"\r
- OutputDirectory="vc_mswunivudll"\r
- IntermediateDirectory="vc_mswunivudll\test_gui"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="vc_mswud"\r
+ IntermediateDirectory="vc_mswud\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
- ObjectFile="vc_mswunivudll\test_gui\"\r
- ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswud\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_core.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"\r
- OutputFile="vc_mswunivudll\test_gui.exe"\r
+ AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib 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"\r
+ OutputFile="vc_mswud\test_gui.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswud\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Universal Debug|Win32"\r
- OutputDirectory="vc_mswunivuddll"\r
- IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+ Name="Release|Win32"\r
+ OutputDirectory="vc_mswu"\r
+ IntermediateDirectory="vc_mswu\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
- ObjectFile="vc_mswunivuddll\test_gui\"\r
- ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswu\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud.lib 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"\r
- OutputFile="vc_mswunivuddll\test_gui.exe"\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
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswu\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Release|Win32"\r
- OutputDirectory="vc_mswudll"\r
- IntermediateDirectory="vc_mswudll\test_gui"\r
+ Name="Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivud"\r
+ IntermediateDirectory="vc_mswunivud\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswudll\test_gui\"\r
- ObjectFile="vc_mswudll\test_gui\"\r
- ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswunivud\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_core.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"\r
- OutputFile="vc_mswudll\test_gui.exe"\r
+ AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib 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"\r
+ OutputFile="vc_mswunivud\test_gui.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswudll\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Debug|Win32"\r
- OutputDirectory="vc_mswuddll"\r
- IntermediateDirectory="vc_mswuddll\test_gui"\r
+ Name="Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivu"\r
+ IntermediateDirectory="vc_mswunivu\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswuddll\test_gui\"\r
- ObjectFile="vc_mswuddll\test_gui\"\r
- ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswunivu\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud.lib 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"\r
- OutputFile="vc_mswuddll\test_gui.exe"\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
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Universal Release|Win32"\r
- OutputDirectory="vc_mswunivu"\r
- IntermediateDirectory="vc_mswunivu\test_gui"\r
+ Name="DLL Debug|Win32"\r
+ OutputDirectory="vc_mswuddll"\r
+ IntermediateDirectory="vc_mswuddll\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswunivu\test_gui\"\r
- ObjectFile="vc_mswunivu\test_gui\"\r
- ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswuddll\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29u_core.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"\r
- OutputFile="vc_mswunivu\test_gui.exe"\r
+ AdditionalDependencies="wxmsw29ud_media.lib wxmsw29ud_xrc.lib wxbase29ud_xml.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxmsw29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib 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"\r
+ OutputFile="vc_mswuddll\test_gui.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Universal Debug|Win32"\r
- OutputDirectory="vc_mswunivud"\r
- IntermediateDirectory="vc_mswunivud\test_gui"\r
+ Name="DLL Release|Win32"\r
+ OutputDirectory="vc_mswudll"\r
+ IntermediateDirectory="vc_mswudll\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswunivud\test_gui\"\r
- ObjectFile="vc_mswunivud\test_gui\"\r
- ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswudll\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmswuniv29ud_core.lib wxbase29ud.lib 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"\r
- OutputFile="vc_mswunivud\test_gui.exe"\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
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswudll\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="vc_mswu"\r
- IntermediateDirectory="vc_mswu\test_gui"\r
+ Name="DLL Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivuddll"\r
+ IntermediateDirectory="vc_mswunivuddll\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswu\test_gui\"\r
- ObjectFile="vc_mswu\test_gui\"\r
- ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswunivuddll\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29u_core.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"\r
- OutputFile="vc_mswu\test_gui.exe"\r
+ AdditionalDependencies="wxmswuniv29ud_media.lib wxmswuniv29ud_xrc.lib wxbase29ud_xml.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxmswuniv29ud_core.lib wxbase29ud_net.lib wxbase29ud.lib 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"\r
+ OutputFile="vc_mswunivuddll\test_gui.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswu\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|Win32"\r
- OutputDirectory="vc_mswud"\r
- IntermediateDirectory="vc_mswud\test_gui"\r
+ Name="DLL Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivudll"\r
+ IntermediateDirectory="vc_mswunivudll\test_gui"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
/>\r
<Tool\r
Name="VCIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
AdditionalOptions="/MP"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
ExceptionHandling="1"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
+ UsePrecompiledHeader="2"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
- AssemblerListingLocation="vc_mswud\test_gui\"\r
- ObjectFile="vc_mswud\test_gui\"\r
- ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
+ ObjectFile="vc_mswunivudll\test_gui\"\r
+ ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxmsw29ud_core.lib wxbase29ud.lib 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"\r
- OutputFile="vc_mswud\test_gui.exe"\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
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
+ ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
SubSystem="1"\r
TargetMachine="1"\r
/>\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswud\test_vc9_test_gui.bsc"\r
+ OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
RelativePath=".\window\clientsize.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\events\clone.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath=".\controls\comboboxtest.cpp"\r
>\r
RelativePath=".\dummy.cpp"\r
>\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32"\r
+ Name="Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32"\r
+ Name="Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32"\r
+ Name="Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32"\r
+ Name="Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Release|Win32"\r
+ Name="DLL Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32"\r
+ Name="DLL Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32"\r
+ Name="DLL Universal Debug|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
+ Name="DLL Universal Release|Win32"\r
>\r
<Tool\r
Name="VCCLCompilerTool"\r
/>\r
</FileConfiguration>\r
</File>\r
+ <File\r
+ RelativePath=".\font\fonttest.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\misc\garbage.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath=".\misc\guifuncs.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\controls\headerctrltest.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\html\htmlwindow.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\image\image.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\controls\listctrltest.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\graphics\measuring.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath=".\geometry\point.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\events\propagation.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath=".\image\rawbmp.cpp"\r
>\r
RelativePath=".\window\setsize.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\misc\settings.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath=".\geometry\size.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\net\socket.cpp"\r
+ >\r
+ </File>\r
<File\r
RelativePath=".\test.cpp"\r
>\r
RelativePath=".\controls\textentrytest.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\controls\treectrltest.cpp"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Resource Files"\r
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
>\r
<File\r
- RelativePath=".\..\samples\sample.rc"\r
+ RelativePath="..\samples\sample.rc"\r
>\r
</File>\r
</Filter>\r
projects / wxWidgets.git / blobdiff