<?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.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\toolbar"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="vc_mswud"\r
+ IntermediateDirectory="vc_mswud\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\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\toolbar\"\r
- ObjectFile="vc_mswunivudll\toolbar\"\r
- ProgramDataBaseFileName="vc_mswunivudll\toolbar.pdb"\r
+ ObjectFile="vc_mswud\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswud\toolbar.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"\r
- OutputFile="vc_mswunivudll\toolbar.exe"\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_mswud\toolbar.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswud\toolbar.pdb"\r
SubSystem="2"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\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\toolbar"\r
+ Name="Release|Win32"\r
+ OutputDirectory="vc_mswu"\r
+ IntermediateDirectory="vc_mswu\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswunivuddll\toolbar\"\r
- ObjectFile="vc_mswunivuddll\toolbar\"\r
- ProgramDataBaseFileName="vc_mswunivuddll\toolbar.pdb"\r
+ ObjectFile="vc_mswu\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswu\toolbar.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"\r
- OutputFile="vc_mswunivuddll\toolbar.exe"\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_mswu\toolbar.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivuddll\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswu\toolbar.pdb"\r
SubSystem="2"\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;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\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\toolbar"\r
+ Name="Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivud"\r
+ IntermediateDirectory="vc_mswunivud\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\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\toolbar\"\r
- ObjectFile="vc_mswudll\toolbar\"\r
- ProgramDataBaseFileName="vc_mswudll\toolbar.pdb"\r
+ ObjectFile="vc_mswunivud\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswunivud\toolbar.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"\r
- OutputFile="vc_mswudll\toolbar.exe"\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_mswunivud\toolbar.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswudll\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswunivud\toolbar.pdb"\r
SubSystem="2"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\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\toolbar"\r
+ Name="Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivu"\r
+ IntermediateDirectory="vc_mswunivu\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswuddll\toolbar\"\r
- ObjectFile="vc_mswuddll\toolbar\"\r
- ProgramDataBaseFileName="vc_mswuddll\toolbar.pdb"\r
+ ObjectFile="vc_mswunivu\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswunivu\toolbar.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"\r
- OutputFile="vc_mswuddll\toolbar.exe"\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_mswunivu\toolbar.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswuddll\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswunivu\toolbar.pdb"\r
SubSystem="2"\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;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\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\toolbar"\r
+ Name="DLL Debug|Win32"\r
+ OutputDirectory="vc_mswuddll"\r
+ IntermediateDirectory="vc_mswuddll\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswunivu\toolbar\"\r
- ObjectFile="vc_mswunivu\toolbar\"\r
- ProgramDataBaseFileName="vc_mswunivu\toolbar.pdb"\r
+ ObjectFile="vc_mswuddll\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswuddll\toolbar.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"\r
- OutputFile="vc_mswunivu\toolbar.exe"\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\toolbar.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivu\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswuddll\toolbar.pdb"\r
SubSystem="2"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>\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\toolbar"\r
+ Name="DLL Release|Win32"\r
+ OutputDirectory="vc_mswudll"\r
+ IntermediateDirectory="vc_mswudll\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswunivud\toolbar\"\r
- ObjectFile="vc_mswunivud\toolbar\"\r
- ProgramDataBaseFileName="vc_mswunivud\toolbar.pdb"\r
+ ObjectFile="vc_mswudll\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswudll\toolbar.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"\r
- OutputFile="vc_mswunivud\toolbar.exe"\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\toolbar.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswunivud\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswudll\toolbar.pdb"\r
SubSystem="2"\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;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>\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\toolbar"\r
+ Name="DLL Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivuddll"\r
+ IntermediateDirectory="vc_mswunivuddll\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ MinimalRebuild="TRUE"\r
ExceptionHandling="TRUE"\r
- RuntimeLibrary="2"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswu\toolbar\"\r
- ObjectFile="vc_mswu\toolbar\"\r
- ProgramDataBaseFileName="vc_mswu\toolbar.pdb"\r
+ ObjectFile="vc_mswunivuddll\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswunivuddll\toolbar.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"\r
- OutputFile="vc_mswu\toolbar.exe"\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\toolbar.exe"\r
LinkIncremental="2"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswu\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswunivuddll\toolbar.pdb"\r
SubSystem="2"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCMIDLTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>\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\toolbar"\r
+ Name="DLL Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivudll"\r
+ IntermediateDirectory="vc_mswunivudll\toolbar"\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;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
- MinimalRebuild="TRUE"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
ExceptionHandling="TRUE"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- BufferSecurityCheck="TRUE"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="TRUE"\r
- AssemblerListingLocation="vc_mswud\toolbar\"\r
- ObjectFile="vc_mswud\toolbar\"\r
- ProgramDataBaseFileName="vc_mswud\toolbar.pdb"\r
+ ObjectFile="vc_mswunivudll\toolbar\"\r
+ ProgramDataBaseFileName="vc_mswunivudll\toolbar.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"\r
- OutputFile="vc_mswud\toolbar.exe"\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\toolbar.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="TRUE"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateDebugInformation="TRUE"\r
- ProgramDatabaseFile="vc_mswud\toolbar.pdb"\r
+ ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb"\r
SubSystem="2"\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;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
projects / wxWidgets.git / blobdiff