<?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.9 (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\renddll"\r
+ Name="DLL Debug|Win32"\r
+ OutputDirectory="vc_mswuddll"\r
+ IntermediateDirectory="vc_mswuddll\renddll"\r
ConfigurationType="2"\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="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswunivudll\renddll\"\r
- ObjectFile="vc_mswunivudll\renddll\"\r
- ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu290_vc.pdb"\r
+ ObjectFile="vc_mswuddll\renddll\"\r
+ ProgramDataBaseFileName="vc_mswuddll\renddll_mswud294_vc.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\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 wininet.lib"\r
- OutputFile="vc_mswunivudll\renddll_mswunivu290_vc.dll"\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 wininet.lib"\r
+ OutputFile="vc_mswuddll\renddll_mswud294_vc.dll"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu290_vc.pdb"\r
+ ProgramDatabaseFile="vc_mswuddll\renddll_mswud294_vc.pdb"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\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;WXUSINGDLL"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\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="DLL Universal Debug|Win32"\r
- OutputDirectory="vc_mswunivuddll"\r
- IntermediateDirectory="vc_mswunivuddll\renddll"\r
+ Name="DLL Release|Win32"\r
+ OutputDirectory="vc_mswudll"\r
+ IntermediateDirectory="vc_mswudll\renddll"\r
ConfigurationType="2"\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="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswunivuddll\renddll\"\r
- ObjectFile="vc_mswunivuddll\renddll\"\r
- ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud290_vc.pdb"\r
+ ObjectFile="vc_mswudll\renddll\"\r
+ ProgramDataBaseFileName="vc_mswudll\renddll_mswu294_vc.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\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 wininet.lib"\r
- OutputFile="vc_mswunivuddll\renddll_mswunivud290_vc.dll"\r
- LinkIncremental="2"\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 wininet.lib"\r
+ OutputFile="vc_mswudll\renddll_mswu294_vc.dll"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud290_vc.pdb"\r
- TargetMachine="1"/>\r
+ ProgramDatabaseFile="vc_mswudll\renddll_mswu294_vc.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL"\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;WXUSINGDLL"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\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="DLL Release|Win32"\r
- OutputDirectory="vc_mswudll"\r
- IntermediateDirectory="vc_mswudll\renddll"\r
+ Name="DLL Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivuddll"\r
+ IntermediateDirectory="vc_mswunivuddll\renddll"\r
ConfigurationType="2"\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="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXUSINGDLL"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswudll\renddll\"\r
- ObjectFile="vc_mswudll\renddll\"\r
- ProgramDataBaseFileName="vc_mswudll\renddll_mswu290_vc.pdb"\r
+ ObjectFile="vc_mswunivuddll\renddll\"\r
+ ProgramDataBaseFileName="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\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 wininet.lib"\r
- OutputFile="vc_mswudll\renddll_mswu290_vc.dll"\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 wininet.lib"\r
+ OutputFile="vc_mswunivuddll\renddll_mswunivud294_vc.dll"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswudll\renddll_mswu290_vc.pdb"\r
+ ProgramDatabaseFile="vc_mswunivuddll\renddll_mswunivud294_vc.pdb"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\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;WXUSINGDLL"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\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="DLL Debug|Win32"\r
- OutputDirectory="vc_mswuddll"\r
- IntermediateDirectory="vc_mswuddll\renddll"\r
+ Name="DLL Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivudll"\r
+ IntermediateDirectory="vc_mswunivudll\renddll"\r
ConfigurationType="2"\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="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswuddll\renddll\"\r
- ObjectFile="vc_mswuddll\renddll\"\r
- ProgramDataBaseFileName="vc_mswuddll\renddll_mswud290_vc.pdb"\r
+ ObjectFile="vc_mswunivudll\renddll\"\r
+ ProgramDataBaseFileName="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="TRUE"\r
Detect64BitPortabilityProblems="TRUE"\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 wininet.lib"\r
- OutputFile="vc_mswuddll\renddll_mswud290_vc.dll"\r
- LinkIncremental="2"\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 wininet.lib"\r
+ OutputFile="vc_mswunivudll\renddll_mswunivu294_vc.dll"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswuddll\renddll_mswud290_vc.pdb"\r
- TargetMachine="1"/>\r
+ ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu294_vc.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL"\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;WXUSINGDLL"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include"/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
projects / wxWidgets.git / blobdiff