X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7da8bfe30de8f632127e96735b6bfd55a489a21c..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/toolbar/toolbar_vc9.vcproj?ds=inline diff --git a/samples/toolbar/toolbar_vc9.vcproj b/samples/toolbar/toolbar_vc9.vcproj index e4260c8146..c70ac5186f 100644 --- a/samples/toolbar/toolbar_vc9.vcproj +++ b/samples/toolbar/toolbar_vc9.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.9 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> @@ -22,9 +22,9 @@ </ToolFiles> <Configurations> <Configuration - Name="DLL Universal Release|Win32" - OutputDirectory="vc_mswunivudll" - IntermediateDirectory="vc_mswunivudll\toolbar" + Name="Debug|Win32" + OutputDirectory="vc_mswud" + IntermediateDirectory="vc_mswud\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -43,20 +43,23 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - 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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswunivudll\toolbar\" - ObjectFile="vc_mswunivudll\toolbar\" - ProgramDataBaseFileName="vc_mswunivudll\toolbar.pdb" + ObjectFile="vc_mswud\toolbar\" + ProgramDataBaseFileName="vc_mswud\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -66,9 +69,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -76,14 +79,14 @@ <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\toolbar.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\toolbar.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb" + ProgramDatabaseFile="vc_mswud\toolbar.pdb" SubSystem="2" TargetMachine="1" /> @@ -98,7 +101,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivudll\toolbar_vc9.bsc" + OutputFile="vc_mswud\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool @@ -112,9 +115,9 @@ /> </Configuration> <Configuration - Name="DLL Universal Debug|Win32" - OutputDirectory="vc_mswunivuddll" - IntermediateDirectory="vc_mswunivuddll\toolbar" + Name="Release|Win32" + OutputDirectory="vc_mswu" + IntermediateDirectory="vc_mswu\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -133,22 +136,21 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswunivuddll\toolbar\" - ObjectFile="vc_mswunivuddll\toolbar\" - ProgramDataBaseFileName="vc_mswunivuddll\toolbar.pdb" + ObjectFile="vc_mswu\toolbar\" + ProgramDataBaseFileName="vc_mswu\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -158,9 +160,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -168,16 +170,18 @@ <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\toolbar.exe" - LinkIncremental="2" + 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\toolbar.exe" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivuddll\toolbar.pdb" + ProgramDatabaseFile="vc_mswu\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -190,7 +194,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivuddll\toolbar_vc9.bsc" + OutputFile="vc_mswu\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool @@ -204,9 +208,9 @@ /> </Configuration> <Configuration - Name="DLL Release|Win32" - OutputDirectory="vc_mswudll" - IntermediateDirectory="vc_mswudll\toolbar" + Name="Universal Debug|Win32" + OutputDirectory="vc_mswunivud" + IntermediateDirectory="vc_mswunivud\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -225,20 +229,23 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - 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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswudll\toolbar\" - ObjectFile="vc_mswudll\toolbar\" - ProgramDataBaseFileName="vc_mswudll\toolbar.pdb" + ObjectFile="vc_mswunivud\toolbar\" + ProgramDataBaseFileName="vc_mswunivud\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -248,9 +255,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -258,14 +265,14 @@ <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\toolbar.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\toolbar.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswudll\toolbar.pdb" + ProgramDatabaseFile="vc_mswunivud\toolbar.pdb" SubSystem="2" TargetMachine="1" /> @@ -280,7 +287,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswudll\toolbar_vc9.bsc" + OutputFile="vc_mswunivud\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool @@ -294,9 +301,9 @@ /> </Configuration> <Configuration - Name="DLL Debug|Win32" - OutputDirectory="vc_mswuddll" - IntermediateDirectory="vc_mswuddll\toolbar" + Name="Universal Release|Win32" + OutputDirectory="vc_mswunivu" + IntermediateDirectory="vc_mswunivu\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -315,22 +322,21 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswuddll\toolbar\" - ObjectFile="vc_mswuddll\toolbar\" - ProgramDataBaseFileName="vc_mswuddll\toolbar.pdb" + ObjectFile="vc_mswunivu\toolbar\" + ProgramDataBaseFileName="vc_mswunivu\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -340,9 +346,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -350,16 +356,18 @@ <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\toolbar.exe" - LinkIncremental="2" + 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\toolbar.exe" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_dll" + AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswuddll\toolbar.pdb" + ProgramDatabaseFile="vc_mswunivu\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -372,7 +380,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswuddll\toolbar_vc9.bsc" + OutputFile="vc_mswunivu\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool @@ -386,9 +394,9 @@ /> </Configuration> <Configuration - Name="Universal Release|Win32" - OutputDirectory="vc_mswunivu" - IntermediateDirectory="vc_mswunivu\toolbar" + Name="DLL Debug|Win32" + OutputDirectory="vc_mswuddll" + IntermediateDirectory="vc_mswuddll\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -407,20 +415,23 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - 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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswunivu\toolbar\" - ObjectFile="vc_mswunivu\toolbar\" - ProgramDataBaseFileName="vc_mswunivu\toolbar.pdb" + ObjectFile="vc_mswuddll\toolbar\" + ProgramDataBaseFileName="vc_mswuddll\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -430,9 +441,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -440,14 +451,14 @@ <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\toolbar.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\toolbar.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivu\toolbar.pdb" + ProgramDatabaseFile="vc_mswuddll\toolbar.pdb" SubSystem="2" TargetMachine="1" /> @@ -462,7 +473,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivu\toolbar_vc9.bsc" + OutputFile="vc_mswuddll\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool @@ -476,9 +487,9 @@ /> </Configuration> <Configuration - Name="Universal Debug|Win32" - OutputDirectory="vc_mswunivud" - IntermediateDirectory="vc_mswunivud\toolbar" + Name="DLL Release|Win32" + OutputDirectory="vc_mswudll" + IntermediateDirectory="vc_mswudll\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -497,22 +508,21 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswunivud\toolbar\" - ObjectFile="vc_mswunivud\toolbar\" - ProgramDataBaseFileName="vc_mswunivud\toolbar.pdb" + ObjectFile="vc_mswudll\toolbar\" + ProgramDataBaseFileName="vc_mswudll\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -522,9 +532,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -532,16 +542,18 @@ <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\toolbar.exe" - LinkIncremental="2" + 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\toolbar.exe" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswunivud\toolbar.pdb" + ProgramDatabaseFile="vc_mswudll\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -554,7 +566,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswunivud\toolbar_vc9.bsc" + OutputFile="vc_mswudll\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool @@ -568,9 +580,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="vc_mswu" - IntermediateDirectory="vc_mswu\toolbar" + Name="DLL Universal Debug|Win32" + OutputDirectory="vc_mswunivuddll" + IntermediateDirectory="vc_mswunivuddll\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -589,20 +601,23 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - 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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswu\toolbar\" - ObjectFile="vc_mswu\toolbar\" - ProgramDataBaseFileName="vc_mswu\toolbar.pdb" + ObjectFile="vc_mswunivuddll\toolbar\" + ProgramDataBaseFileName="vc_mswunivuddll\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -612,9 +627,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -622,14 +637,14 @@ <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\toolbar.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\toolbar.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswu\toolbar.pdb" + ProgramDatabaseFile="vc_mswunivuddll\toolbar.pdb" SubSystem="2" TargetMachine="1" /> @@ -644,7 +659,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswu\toolbar_vc9.bsc" + OutputFile="vc_mswunivuddll\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool @@ -658,9 +673,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="vc_mswud" - IntermediateDirectory="vc_mswud\toolbar" + Name="DLL Universal Release|Win32" + OutputDirectory="vc_mswunivudll" + IntermediateDirectory="vc_mswunivudll\toolbar" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -679,22 +694,21 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + Optimization="2" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" ExceptionHandling="1" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" - AssemblerListingLocation="vc_mswud\toolbar\" - ObjectFile="vc_mswud\toolbar\" - ProgramDataBaseFileName="vc_mswud\toolbar.pdb" + ObjectFile="vc_mswunivudll\toolbar\" + ProgramDataBaseFileName="vc_mswunivudll\toolbar.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -704,9 +718,9 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH" Culture="1033" - AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples" + AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples" /> <Tool Name="VCPreLinkEventTool" @@ -714,16 +728,18 @@ <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\toolbar.exe" - LinkIncremental="2" + 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\toolbar.exe" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=".\..\..\lib\vc_lib" + AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswud\toolbar.pdb" + ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -736,7 +752,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="vc_mswud\toolbar_vc9.bsc" + OutputFile="vc_mswunivudll\toolbar_vc9.bsc" SuppressStartupBanner="true" /> <Tool