X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..d5e7ffcf7af0e444cc8b3d3cfc2e2ca263f411d5:/samples/image/image_vc7.vcproj diff --git a/samples/image/image_vc7.vcproj b/samples/image/image_vc7.vcproj index d3a74c3c2f..c6d4ce2269 100644 --- a/samples/image/image_vc7.vcproj +++ b/samples/image/image_vc7.vcproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="Windows-1252"?> <!-- - This makefile was generated by - Bakefile 0.2.4 (http://www.bakefile.org) + This project was generated by + Bakefile 0.2.6 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> @@ -17,24 +17,26 @@ </Platforms> <Configurations> <Configuration - Name="DLL Universal Release|Win32" - OutputDirectory="vc_mswunivudll" - IntermediateDirectory="vc_mswunivudll\image" + Name="Debug|Win32" + OutputDirectory="vc_mswud" + IntermediateDirectory="vc_mswud\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Optimization="0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + MinimalRebuild="TRUE" ExceptionHandling="TRUE" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="TRUE" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswunivudll\image\" - ObjectFile="vc_mswunivudll\image\" - ProgramDataBaseFileName="vc_mswunivudll\image.pdb" + ObjectFile="vc_mswud\image\" + ProgramDataBaseFileName="vc_mswud\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -44,17 +46,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswunivudll\image.exe" + 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" + OutputFile="vc_mswud\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswunivudll\image.pdb" + ProgramDatabaseFile="vc_mswud\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -63,9 +67,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -78,27 +82,23 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="DLL Universal Debug|Win32" - OutputDirectory="vc_mswunivuddll" - IntermediateDirectory="vc_mswunivuddll\image" + Name="Release|Win32" + OutputDirectory="vc_mswu" + IntermediateDirectory="vc_mswu\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" - MinimalRebuild="TRUE" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" + RuntimeLibrary="2" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswunivuddll\image\" - ObjectFile="vc_mswunivuddll\image\" - ProgramDataBaseFileName="vc_mswunivuddll\image.pdb" + ObjectFile="vc_mswu\image\" + ProgramDataBaseFileName="vc_mswu\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -108,17 +108,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswunivuddll\image.exe" + 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" + OutputFile="vc_mswu\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswunivuddll\image.pdb" + ProgramDatabaseFile="vc_mswu\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -127,9 +129,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -142,24 +144,26 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="DLL Release|Win32" - OutputDirectory="vc_mswudll" - IntermediateDirectory="vc_mswudll\image" + Name="Universal Debug|Win32" + OutputDirectory="vc_mswunivud" + IntermediateDirectory="vc_mswunivud\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Optimization="0" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + MinimalRebuild="TRUE" ExceptionHandling="TRUE" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="TRUE" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswudll\image\" - ObjectFile="vc_mswudll\image\" - ProgramDataBaseFileName="vc_mswudll\image.pdb" + ObjectFile="vc_mswunivud\image\" + ProgramDataBaseFileName="vc_mswunivud\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -169,17 +173,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswudll\image.exe" + 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" + OutputFile="vc_mswunivud\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswudll\image.pdb" + ProgramDatabaseFile="vc_mswunivud\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -188,9 +194,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -203,27 +209,23 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="DLL Debug|Win32" - OutputDirectory="vc_mswuddll" - IntermediateDirectory="vc_mswuddll\image" + Name="Universal Release|Win32" + OutputDirectory="vc_mswunivu" + IntermediateDirectory="vc_mswunivu\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" - MinimalRebuild="TRUE" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" + RuntimeLibrary="2" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswuddll\image\" - ObjectFile="vc_mswuddll\image\" - ProgramDataBaseFileName="vc_mswuddll\image.pdb" + ObjectFile="vc_mswunivu\image\" + ProgramDataBaseFileName="vc_mswunivu\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -233,17 +235,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswuddll\image.exe" + 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" + OutputFile="vc_mswunivu\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswuddll\image.pdb" + ProgramDatabaseFile="vc_mswunivu\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -252,9 +256,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -267,24 +271,26 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Universal Release|Win32" - OutputDirectory="vc_mswunivu" - IntermediateDirectory="vc_mswunivu\image" + Name="DLL Debug|Win32" + OutputDirectory="vc_mswuddll" + IntermediateDirectory="vc_mswuddll\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + Optimization="0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + MinimalRebuild="TRUE" ExceptionHandling="TRUE" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="TRUE" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswunivu\image\" - ObjectFile="vc_mswunivu\image\" - ProgramDataBaseFileName="vc_mswunivu\image.pdb" + ObjectFile="vc_mswuddll\image\" + ProgramDataBaseFileName="vc_mswuddll\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -294,17 +300,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswunivu\image.exe" + 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" + OutputFile="vc_mswuddll\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswunivu\image.pdb" + ProgramDatabaseFile="vc_mswuddll\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -313,9 +321,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -328,27 +336,23 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Universal Debug|Win32" - OutputDirectory="vc_mswunivud" - IntermediateDirectory="vc_mswunivud\image" + Name="DLL Release|Win32" + OutputDirectory="vc_mswudll" + IntermediateDirectory="vc_mswudll\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" - MinimalRebuild="TRUE" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" + RuntimeLibrary="2" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswunivud\image\" - ObjectFile="vc_mswunivud\image\" - ProgramDataBaseFileName="vc_mswunivud\image.pdb" + ObjectFile="vc_mswudll\image\" + ProgramDataBaseFileName="vc_mswudll\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -358,17 +362,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswunivud\image.exe" + 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" + OutputFile="vc_mswudll\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswunivud\image.pdb" + ProgramDatabaseFile="vc_mswudll\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -377,9 +383,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -392,24 +398,26 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="vc_mswu" - IntermediateDirectory="vc_mswu\image" + Name="DLL Universal Debug|Win32" + OutputDirectory="vc_mswunivuddll" + IntermediateDirectory="vc_mswunivuddll\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + Optimization="0" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + MinimalRebuild="TRUE" ExceptionHandling="TRUE" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="TRUE" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswu\image\" - ObjectFile="vc_mswu\image\" - ProgramDataBaseFileName="vc_mswu\image.pdb" + ObjectFile="vc_mswunivuddll\image\" + ProgramDataBaseFileName="vc_mswunivuddll\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -419,17 +427,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswu\image.exe" + 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" + OutputFile="vc_mswunivuddll\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswu\image.pdb" + ProgramDatabaseFile="vc_mswunivuddll\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -438,9 +448,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -453,27 +463,23 @@ Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="vc_mswud" - IntermediateDirectory="vc_mswud\image" + Name="DLL Universal Release|Win32" + OutputDirectory="vc_mswunivudll" + IntermediateDirectory="vc_mswunivudll\image" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" - MinimalRebuild="TRUE" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" ExceptionHandling="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="TRUE" + RuntimeLibrary="2" RuntimeTypeInfo="TRUE" - AssemblerListingLocation="vc_mswud\image\" - ObjectFile="vc_mswud\image\" - ProgramDataBaseFileName="vc_mswud\image.pdb" + ObjectFile="vc_mswunivudll\image\" + ProgramDataBaseFileName="vc_mswunivudll\image.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -483,17 +489,19 @@ <Tool Name="VCLinkerTool" AdditionalOptions="" - 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" - OutputFile="vc_mswud\image.exe" + 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" + OutputFile="vc_mswunivudll\image.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswud\image.pdb" + ProgramDatabaseFile="vc_mswunivudll\image.pdb" SubSystem="2" TargetMachine="1"/> <Tool - Name="VCMIDLTool"/> + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCPostBuildEventTool"/> <Tool @@ -502,9 +510,9 @@ Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/> + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool @@ -525,10 +533,21 @@ Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath=".\canvas.cpp"> + </File> <File RelativePath=".\image.cpp"> </File> </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + <File + RelativePath=".\canvas.h"> + </File> + </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"