-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
<!--\r
\r
- This makefile was generated by\r
- Bakefile 0.2.3 (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
</ToolFiles>\r
<Configurations>\r
<Configuration\r
- Name="DLL Universal Release|Win32"\r
- OutputDirectory="vc_mswunivudll"\r
- IntermediateDirectory="vc_mswunivudll\conftest"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="vc_mswud"\r
+ IntermediateDirectory="vc_mswud\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="false"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+ MinimalRebuild="true"\r
ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="2"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswunivudll\conftest\"\r
- ObjectFile="vc_mswunivudll\conftest\"\r
- ProgramDataBaseFileName="vc_mswunivudll\conftest.pdb"\r
+ ObjectFile="vc_mswud\conftest\"\r
+ ProgramDataBaseFileName="vc_mswud\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswunivudll\conftest.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\conftest.exe"\r
LinkIncremental="2"\r
- SubSystem="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivudll\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswud\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivudll\config_vc8.bsc"\r
+ OutputFile="vc_mswud\config_vc8.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\conftest"\r
+ Name="Release|Win32"\r
+ OutputDirectory="vc_mswu"\r
+ IntermediateDirectory="vc_mswu\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r
ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswunivuddll\conftest\"\r
- ObjectFile="vc_mswunivuddll\conftest\"\r
- ProgramDataBaseFileName="vc_mswunivuddll\conftest.pdb"\r
+ ObjectFile="vc_mswu\conftest\"\r
+ ProgramDataBaseFileName="vc_mswu\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswunivuddll\conftest.exe"\r
- LinkIncremental="2"\r
- SubSystem="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\conftest.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivuddll\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswu\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivuddll\config_vc8.bsc"\r
+ OutputFile="vc_mswu\config_vc8.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\conftest"\r
+ Name="Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivud"\r
+ IntermediateDirectory="vc_mswunivud\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="false"\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="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="2"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswudll\conftest\"\r
- ObjectFile="vc_mswudll\conftest\"\r
- ProgramDataBaseFileName="vc_mswudll\conftest.pdb"\r
+ ObjectFile="vc_mswunivud\conftest\"\r
+ ProgramDataBaseFileName="vc_mswunivud\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswudll\conftest.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\conftest.exe"\r
LinkIncremental="2"\r
- SubSystem="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswudll\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswunivud\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswudll\config_vc8.bsc"\r
+ OutputFile="vc_mswunivud\config_vc8.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\conftest"\r
+ Name="Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivu"\r
+ IntermediateDirectory="vc_mswunivu\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r
ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswuddll\conftest\"\r
- ObjectFile="vc_mswuddll\conftest\"\r
- ProgramDataBaseFileName="vc_mswuddll\conftest.pdb"\r
+ ObjectFile="vc_mswunivu\conftest\"\r
+ ProgramDataBaseFileName="vc_mswunivu\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswuddll\conftest.exe"\r
- LinkIncremental="2"\r
- SubSystem="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\conftest.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswuddll\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswunivu\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswuddll\config_vc8.bsc"\r
+ OutputFile="vc_mswunivu\config_vc8.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\conftest"\r
+ Name="DLL Debug|Win32"\r
+ OutputDirectory="vc_mswuddll"\r
+ IntermediateDirectory="vc_mswuddll\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="false"\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="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="2"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswunivu\conftest\"\r
- ObjectFile="vc_mswunivu\conftest\"\r
- ProgramDataBaseFileName="vc_mswunivu\conftest.pdb"\r
+ ObjectFile="vc_mswuddll\conftest\"\r
+ ProgramDataBaseFileName="vc_mswuddll\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswunivu\conftest.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\conftest.exe"\r
LinkIncremental="2"\r
- SubSystem="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivu\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswuddll\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivu\config_vc8.bsc"\r
+ OutputFile="vc_mswuddll\config_vc8.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\conftest"\r
+ Name="DLL Release|Win32"\r
+ OutputDirectory="vc_mswudll"\r
+ IntermediateDirectory="vc_mswudll\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswunivud\conftest\"\r
- ObjectFile="vc_mswunivud\conftest\"\r
- ProgramDataBaseFileName="vc_mswunivud\conftest.pdb"\r
+ ObjectFile="vc_mswudll\conftest\"\r
+ ProgramDataBaseFileName="vc_mswudll\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswunivud\conftest.exe"\r
- LinkIncremental="2"\r
- SubSystem="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\conftest.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswunivud\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswudll\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswunivud\config_vc8.bsc"\r
+ OutputFile="vc_mswudll\config_vc8.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="vc_mswu"\r
- IntermediateDirectory="vc_mswu\conftest"\r
+ Name="DLL Universal Debug|Win32"\r
+ OutputDirectory="vc_mswunivuddll"\r
+ IntermediateDirectory="vc_mswunivuddll\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="false"\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="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="2"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="true"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswu\conftest\"\r
- ObjectFile="vc_mswu\conftest\"\r
- ProgramDataBaseFileName="vc_mswu\conftest.pdb"\r
+ ObjectFile="vc_mswunivuddll\conftest\"\r
+ ProgramDataBaseFileName="vc_mswunivuddll\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswu\conftest.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\conftest.exe"\r
LinkIncremental="2"\r
- SubSystem="2"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswu\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswunivuddll\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswu\config_vc8.bsc"\r
+ OutputFile="vc_mswunivuddll\config_vc8.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|Win32"\r
- OutputDirectory="vc_mswud"\r
- IntermediateDirectory="vc_mswud\conftest"\r
+ Name="DLL Universal Release|Win32"\r
+ OutputDirectory="vc_mswunivudll"\r
+ IntermediateDirectory="vc_mswunivudll\conftest"\r
ConfigurationType="1"\r
UseOfMFC="0"\r
ATLMinimizesCRunTimeLibraryUsage="false"\r
Name="VCWebServiceProxyGeneratorTool"\r
/>\r
<Tool\r
- Name="VCIDLTool"\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
- MinimalRebuild="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
+ PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
+ RuntimeLibrary="2"\r
RuntimeTypeInfo="true"\r
- AssemblerListingLocation="vc_mswud\conftest\"\r
- ObjectFile="vc_mswud\conftest\"\r
- ProgramDataBaseFileName="vc_mswud\conftest.pdb"\r
+ ObjectFile="vc_mswunivudll\conftest\"\r
+ ProgramDataBaseFileName="vc_mswunivudll\conftest.pdb"\r
WarningLevel="4"\r
SuppressStartupBanner="true"\r
+ Detect64BitPortabilityProblems="true"\r
+ DebugInformationFormat="3"\r
/>\r
<Tool\r
Name="VCManagedResourceCompilerTool"\r
/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"\r
Culture="1033"\r
- AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"\r
+ AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"\r
/>\r
<Tool\r
Name="VCPreLinkEventTool"\r
/>\r
<Tool\r
Name="VCLinkerTool"\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
AdditionalOptions=""\r
- OutputFile="vc_mswud\conftest.exe"\r
- LinkIncremental="2"\r
- SubSystem="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\conftest.exe"\r
+ LinkIncremental="1"\r
SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+ AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
GenerateManifest="true"\r
GenerateDebugInformation="true"\r
- ProgramDatabaseFile="vc_mswud\conftest.pdb"\r
+ ProgramDatabaseFile="vc_mswunivudll\conftest.pdb"\r
+ SubSystem="2"\r
TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"\r
/>\r
<Tool\r
Name="VCALinkTool"\r
/>\r
+ <Tool\r
+ Name="VCManifestTool"\r
+ />\r
<Tool\r
Name="VCXDCMakeTool"\r
/>\r
<Tool\r
Name="VCBscMakeTool"\r
- OutputFile="vc_mswud\config_vc8.bsc"\r
+ OutputFile="vc_mswunivudll\config_vc8.bsc"\r
SuppressStartupBanner="true"\r
/>\r
<Tool\r
<Files>\r
<Filter\r
Name="Source Files"\r
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
>\r
<File\r
RelativePath=".\conftest.cpp"\r
- />\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Resource Files"\r
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
>\r
<File\r
- RelativePath=".\conftest.rc"\r
- />\r
+ RelativePath="..\..\samples\sample.rc"\r
+ >\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
projects / wxWidgets.git / blobdiff