X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcf2821a15b8dd75fcd4daa2ac91d600b23b2d1..8d9eee83203dfc7177cd8639c14a5c809085698d:/build/msw/wx_vc8_core.vcproj diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 8dd8c705af..85402b6a9f 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -44,14 +44,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0" MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" @@ -73,7 +73,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -129,14 +129,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -155,7 +155,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -211,14 +211,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0" MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" @@ -240,7 +240,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -296,14 +296,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -322,7 +322,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -378,14 +378,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" @@ -396,7 +396,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch" ObjectFile="vc_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -407,7 +407,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -418,14 +418,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb" TargetMachine="1" /> <Tool @@ -472,14 +472,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -487,7 +487,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch" ObjectFile="vc_mswudll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -498,7 +498,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -509,14 +509,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -565,14 +565,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" MinimalRebuild="true" ExceptionHandling="1" BasicRuntimeChecks="3" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch" ObjectFile="vc_mswunivuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -594,7 +594,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -605,14 +605,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29ud.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb" TargetMachine="1" /> <Tool @@ -659,14 +659,14 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -674,7 +674,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch" ObjectFile="vc_mswunivudll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -685,7 +685,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0" Culture="1033" AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> @@ -696,14 +696,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="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 ..\..\lib\vc_dll\wxbase29u.lib" - OutputFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -2560,10 +2560,10 @@ /> </File> <File - RelativePath="..\..\src\msw\nonownedwnd.cpp" - > - </File> - <File + RelativePath="..\..\src\msw\nonownedwnd.cpp" + > + </File> + <File RelativePath="..\..\src\msw\notebook.cpp" > <FileConfiguration @@ -5788,10 +5788,10 @@ > </File> <File - RelativePath="..\..\include\wx\msw\custombgwin.h" - > - </File> - <File + RelativePath="..\..\include\wx\msw\custombgwin.h" + > + </File> + <File RelativePath="..\..\include\wx\msw\ole\dataform.h" > </File> @@ -5808,10 +5808,10 @@ > </File> <File - RelativePath="..\..\include\wx\msw\datetimectrl.h" - > - </File> - <File + RelativePath="..\..\include\wx\msw\datetimectrl.h" + > + </File> + <File RelativePath="..\..\include\wx\msw\dc.h" > </File> @@ -6068,10 +6068,10 @@ > </File> <File - RelativePath="..\..\include\wx\msw\nonownedwnd.h" - > - </File> - <File + RelativePath="..\..\include\wx\msw\nonownedwnd.h" + > + </File> + <File RelativePath="..\..\include\wx\msw\notebook.h" > </File> @@ -6196,10 +6196,10 @@ > </File> <File - RelativePath="..\..\include\wx\msw\timectrl.h" - > - </File> - <File + RelativePath="..\..\include\wx\msw\timectrl.h" + > + </File> + <File RelativePath="..\..\include\wx\msw\toolbar.h" > </File> @@ -6227,6 +6227,14 @@ RelativePath="..\..\include\wx\msw\uxthemep.h" > </File> + <File + RelativePath="..\..\include\wx\msw\webview_ie.h" + > + </File> + <File + RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h" + > + </File> <File RelativePath="..\..\include\wx\msw\window.h" > @@ -6289,10 +6297,10 @@ > </File> <File - RelativePath="..\..\include\wx\generic\custombgwin.h" - > - </File> - <File + RelativePath="..\..\include\wx\generic\custombgwin.h" + > + </File> + <File RelativePath="..\..\include\wx\generic\dataview.h" > </File> @@ -6477,10 +6485,10 @@ > </File> <File - RelativePath="..\..\include\wx\generic\timectrl.h" - > - </File> - <File + RelativePath="..\..\include\wx\generic\timectrl.h" + > + </File> + <File RelativePath="..\..\include\wx\generic\treectlg.h" > </File> @@ -6538,10 +6546,10 @@ > </File> <File - RelativePath="..\..\include\wx\univ\custombgwin.h" - > - </File> - <File + RelativePath="..\..\include\wx\univ\custombgwin.h" + > + </File> + <File RelativePath="..\..\include\wx\univ\dialog.h" > </File> @@ -6948,10 +6956,10 @@ > </File> <File - RelativePath="..\..\include\wx\custombgwin.h" - > - </File> - <File + RelativePath="..\..\include\wx\custombgwin.h" + > + </File> + <File RelativePath="..\..\include\wx\dataobj.h" > </File> @@ -6967,6 +6975,10 @@ RelativePath="..\..\include\wx\dateevt.h" > </File> + <File + RelativePath="..\..\include\wx\datetimectrl.h" + > + </File> <File RelativePath="..\..\include\wx\dc.h" > @@ -7579,6 +7591,10 @@ RelativePath="..\..\include\wx\richtext\richtextxml.h" > </File> + <File + RelativePath="..\..\include\wx\richtooltip.h" + > + </File> <File RelativePath="..\..\include\wx\sashwin.h" > @@ -7700,10 +7716,10 @@ > </File> <File - RelativePath="..\..\include\wx\timectrl.h" - > - </File> - <File + RelativePath="..\..\include\wx\timectrl.h" + > + </File> + <File RelativePath="..\..\include\wx\tipdlg.h" > </File> @@ -7791,6 +7807,14 @@ RelativePath="..\..\include\wx\vscroll.h" > </File> + <File + RelativePath="..\..\include\wx\webview.h" + > + </File> + <File + RelativePath="..\..\include\wx\webviewarchivehandler.h" + > + </File> <File RelativePath="..\..\include\wx\persist\window.h" > @@ -8048,10 +8072,10 @@ > </File> <File - RelativePath="..\..\include\wx\xrc\xh_timectrl.h" - > - </File> - <File + RelativePath="..\..\include\wx\xrc\xh_timectrl.h" + > + </File> + <File RelativePath="..\..\include\wx\xrc\xh_toolb.h" > </File>