<?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
</Platforms>\r
<Configurations>\r
<Configuration\r
- Name="DLL Universal Release|Win32"\r
- OutputDirectory="vc_mswunivudll"\r
- IntermediateDirectory="vc_mswunivudll\test"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="vc_mswud"\r
+ IntermediateDirectory="vc_mswud\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswunivudll\test\"\r
- ObjectFile="vc_mswunivudll\test\"\r
- ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+ ObjectFile="vc_mswud\test\"\r
+ ProgramDataBaseFileName="vc_mswud\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29u_net.lib wxbase29u.lib wxbase29u_xml.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.exe"\r
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud_xml.lib wxbase29ud.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.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
+ ProgramDatabaseFile="vc_mswud\test.pdb"\r
SubSystem="1"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Universal Debug|Win32"\r
- OutputDirectory="vc_mswunivuddll"\r
- IntermediateDirectory="vc_mswunivuddll\test"\r
+ Name="Release|Win32"\r
+ OutputDirectory="vc_mswu"\r
+ IntermediateDirectory="vc_mswu\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswunivuddll\test\"\r
- ObjectFile="vc_mswunivuddll\test\"\r
- ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+ ObjectFile="vc_mswu\test\"\r
+ ProgramDataBaseFileName="vc_mswu\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.lib wxbase29ud_xml.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.exe"\r
- LinkIncremental="2"\r
+ AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.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.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
+ ProgramDatabaseFile="vc_mswu\test.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Release|Win32"\r
- OutputDirectory="vc_mswudll"\r
- IntermediateDirectory="vc_mswudll\test"\r
+ Name="Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivud"\r
+ IntermediateDirectory="vc_mswunivud\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswudll\test\"\r
- ObjectFile="vc_mswudll\test\"\r
- ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
+ ObjectFile="vc_mswunivud\test\"\r
+ ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29u_net.lib wxbase29u.lib wxbase29u_xml.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.exe"\r
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud_xml.lib wxbase29ud.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.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswudll\test.pdb"\r
+ ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
SubSystem="1"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Debug|Win32"\r
- OutputDirectory="vc_mswuddll"\r
- IntermediateDirectory="vc_mswuddll\test"\r
+ Name="Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivu"\r
+ IntermediateDirectory="vc_mswunivu\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswuddll\test\"\r
- ObjectFile="vc_mswuddll\test\"\r
- ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
+ ObjectFile="vc_mswunivu\test\"\r
+ ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.lib wxbase29ud_xml.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.exe"\r
- LinkIncremental="2"\r
+ AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.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.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
+ ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="Universal Release|Win32"\r
- OutputDirectory="vc_mswunivu"\r
- IntermediateDirectory="vc_mswunivu\test"\r
+ Name="DLL Debug|Win32"\r
+ OutputDirectory="vc_mswuddll"\r
+ IntermediateDirectory="vc_mswuddll\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswunivu\test\"\r
- ObjectFile="vc_mswunivu\test\"\r
- ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+ ObjectFile="vc_mswuddll\test\"\r
+ ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29u_net.lib wxbase29u.lib wxbase29u_xml.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.exe"\r
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud_xml.lib wxbase29ud.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.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
+ ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
SubSystem="1"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="Universal Debug|Win32"\r
- OutputDirectory="vc_mswunivud"\r
- IntermediateDirectory="vc_mswunivud\test"\r
+ Name="DLL Release|Win32"\r
+ OutputDirectory="vc_mswudll"\r
+ IntermediateDirectory="vc_mswudll\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswunivud\test\"\r
- ObjectFile="vc_mswunivud\test\"\r
- ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+ ObjectFile="vc_mswudll\test\"\r
+ ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.lib wxbase29ud_xml.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.exe"\r
- LinkIncremental="2"\r
+ AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.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.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
+ ProgramDatabaseFile="vc_mswudll\test.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="vc_mswu"\r
- IntermediateDirectory="vc_mswu\test"\r
+ Name="DLL Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivuddll"\r
+ IntermediateDirectory="vc_mswunivuddll\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswu\test\"\r
- ObjectFile="vc_mswu\test\"\r
- ProgramDataBaseFileName="vc_mswu\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
+ ObjectFile="vc_mswunivuddll\test\"\r
+ ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29u_net.lib wxbase29u.lib wxbase29u_xml.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.exe"\r
+ AdditionalDependencies="wxbase29ud_net.lib wxbase29ud_xml.lib wxbase29ud.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.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswu\test.pdb"\r
+ ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
SubSystem="1"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|Win32"\r
- OutputDirectory="vc_mswud"\r
- IntermediateDirectory="vc_mswud\test"\r
+ Name="DLL Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivudll"\r
+ IntermediateDirectory="vc_mswunivudll\test"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="testprec.h"\r
- PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
- AssemblerListingLocation="vc_mswud\test\"\r
- ObjectFile="vc_mswud\test\"\r
- ProgramDataBaseFileName="vc_mswud\test.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
+ ObjectFile="vc_mswunivudll\test\"\r
+ ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalOptions=""\r
- AdditionalDependencies="wxbase29ud_net.lib wxbase29ud.lib wxbase29ud_xml.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.exe"\r
- LinkIncremental="2"\r
+ AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.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.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswud\test.pdb"\r
+ ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
SubSystem="1"\r
- TargetMachine="1"/>\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
+ AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\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=".\any\anytest.cpp">\r
+ </File>\r
<File\r
RelativePath=".\archive\archivetest.cpp">\r
</File>\r
<File\r
RelativePath=".\dummy.cpp">\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32">\r
+ Name="Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32">\r
+ Name="Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32">\r
+ Name="Universal Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32">\r
+ Name="Universal Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Release|Win32">\r
+ Name="DLL Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32">\r
+ Name="DLL Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32">\r
+ Name="DLL Universal Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32">\r
+ Name="DLL Universal Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
<File\r
RelativePath=".\events\evthandler.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\events\evtsource.cpp">\r
+ </File>\r
+ <File\r
+ RelativePath=".\exec\exec.cpp">\r
+ </File>\r
<File\r
RelativePath=".\streams\ffilestream.cpp">\r
</File>\r
<File\r
RelativePath=".\filesys\filesystest.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\file\filetest.cpp">\r
+ </File>\r
<File\r
RelativePath=".\fontmap\fontmaptest.cpp">\r
</File>\r
<File\r
RelativePath=".\formatconverter\formatconvertertest.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\fswatcher\fswatchertest.cpp">\r
+ </File>\r
<File\r
RelativePath=".\hashes\hashes.cpp">\r
</File>\r
<File\r
RelativePath=".\lists\lists.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\log\logtest.cpp">\r
+ </File>\r
<File\r
RelativePath=".\longlong\longlongtest.cpp">\r
</File>\r
<File\r
RelativePath=".\streams\sstream.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\streams\stdstream.cpp">\r
+ </File>\r
<File\r
RelativePath=".\strings\stdstrings.cpp">\r
</File>\r
<File\r
RelativePath=".\strings\tokenizer.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\misc\typeinfotest.cpp">\r
+ </File>\r
<File\r
RelativePath=".\strings\unichar.cpp">\r
</File>\r
<File\r
RelativePath=".\uris\uris.cpp">\r
</File>\r
+ <File\r
+ RelativePath=".\uris\url.cpp">\r
+ </File>\r
<File\r
RelativePath=".\strings\vararg.cpp">\r
</File>\r
projects / wxWidgets.git / blobdiff