X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9bb9964e261781d575353864cc027b3ca8ba445e..d68a2a24d1d25542974045f0bff3f035c192e5bb:/build/msw/wx_vc9_core.vcproj diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 1510b5a7e7..9a54b88268 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -44,7 +44,7 @@ /> <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 @@ -52,7 +52,7 @@ AdditionalOptions="/MP" 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" ExceptionHandling="1" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -72,7 +72,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" /> @@ -128,7 +128,7 @@ /> <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 @@ -136,7 +136,7 @@ AdditionalOptions="/MP" 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" @@ -154,7 +154,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" /> @@ -210,7 +210,7 @@ /> <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 @@ -218,7 +218,7 @@ AdditionalOptions="/MP" 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" ExceptionHandling="1" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -238,7 +238,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" /> @@ -294,7 +294,7 @@ /> <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 @@ -302,7 +302,7 @@ AdditionalOptions="/MP" 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" @@ -320,7 +320,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" /> @@ -376,7 +376,7 @@ /> <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 @@ -384,7 +384,7 @@ AdditionalOptions="/MP" 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" ExceptionHandling="1" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -394,7 +394,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch" ObjectFile="vc_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -404,7 +404,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_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" /> @@ -415,14 +415,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\wxmsw292ud_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\wxmsw292ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb" TargetMachine="1" /> <Tool @@ -469,7 +469,7 @@ /> <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 @@ -477,7 +477,7 @@ AdditionalOptions="/MP" 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" @@ -485,7 +485,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch" ObjectFile="vc_mswudll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -495,7 +495,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_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" /> @@ -506,14 +506,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\wxmsw292u_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\wxmsw292u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -562,7 +562,7 @@ /> <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 @@ -570,7 +570,7 @@ AdditionalOptions="/MP" 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" ExceptionHandling="1" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -580,7 +580,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch" ObjectFile="vc_mswunivuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -590,7 +590,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_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" /> @@ -601,14 +601,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\wxmswuniv292ud_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\wxmswuniv292ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb" TargetMachine="1" /> <Tool @@ -655,7 +655,7 @@ /> <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 @@ -663,7 +663,7 @@ AdditionalOptions="/MP" 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" @@ -671,7 +671,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch" ObjectFile="vc_mswunivudll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -681,7 +681,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292u_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" /> @@ -692,14 +692,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\wxmswuniv292u_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\wxmswuniv292u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -742,6 +742,10 @@ RelativePath="..\..\src\common\accesscmn.cpp" > </File> + <File + RelativePath="..\..\src\common\affinematrix2d.cpp" + > + </File> <File RelativePath="..\..\src\common\anidecod.cpp" > @@ -1119,10 +1123,10 @@ > </File> <File - RelativePath="..\..\src\common\markupparser.cpp" - > - </File> - <File + RelativePath="..\..\src\common\markupparser.cpp" + > + </File> + <File RelativePath="..\..\src\common\matrix.cpp" > </File> @@ -1391,6 +1395,26 @@ RelativePath="..\..\src\msw\ole\activex.cpp" > </File> + <File + RelativePath="..\..\src\msw\anybutton.cpp" + > + <FileConfiguration + Name="Universal Debug|Win32" + ExcludedFromBuild="true" + /> + <FileConfiguration + Name="Universal Release|Win32" + ExcludedFromBuild="true" + /> + <FileConfiguration + Name="DLL Universal Debug|Win32" + ExcludedFromBuild="true" + /> + <FileConfiguration + Name="DLL Universal Release|Win32" + ExcludedFromBuild="true" + /> + </File> <File RelativePath="..\..\src\msw\app.cpp" > @@ -2531,6 +2555,10 @@ ExcludedFromBuild="true" /> </File> + <File + RelativePath="..\..\src\msw\nonownedwnd.cpp" + > + </File> <File RelativePath="..\..\src\msw\notebook.cpp" > @@ -2611,6 +2639,26 @@ RelativePath="..\..\src\msw\palette.cpp" > </File> + <File + RelativePath="..\..\src\msw\panel.cpp" + > + <FileConfiguration + Name="Universal Debug|Win32" + ExcludedFromBuild="true" + /> + <FileConfiguration + Name="Universal Release|Win32" + ExcludedFromBuild="true" + /> + <FileConfiguration + Name="DLL Universal Debug|Win32" + ExcludedFromBuild="true" + /> + <FileConfiguration + Name="DLL Universal Release|Win32" + ExcludedFromBuild="true" + /> + </File> <File RelativePath="..\..\src\msw\pen.cpp" > @@ -3748,6 +3796,10 @@ RelativePath="..\..\src\generic\logg.cpp" > </File> + <File + RelativePath="..\..\src\generic\markuptext.cpp" + > + </File> <File RelativePath="..\..\src\generic\mdig.cpp" > @@ -3776,10 +3828,6 @@ RelativePath="..\..\src\generic\numdlgg.cpp" > </File> - <File - RelativePath="..\..\src\generic\panelg.cpp" - > - </File> <File RelativePath="..\..\src\generic\printps.cpp" > @@ -5647,6 +5695,10 @@ RelativePath="..\..\include\wx\msw\ole\activex.h" > </File> + <File + RelativePath="..\..\include\wx\msw\anybutton.h" + > + </File> <File RelativePath="..\..\include\wx\msw\app.h" > @@ -5731,6 +5783,10 @@ RelativePath="..\..\include\wx\msw\cursor.h" > </File> + <File + RelativePath="..\..\include\wx\msw\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\msw\ole\dataform.h" > @@ -5747,6 +5803,10 @@ RelativePath="..\..\include\wx\msw\datectrl.h" > </File> + <File + RelativePath="..\..\include\wx\msw\datetimectrl.h" + > + </File> <File RelativePath="..\..\include\wx\msw\dc.h" > @@ -5959,6 +6019,10 @@ RelativePath="..\..\include\wx\msw\iniconf.h" > </File> + <File + RelativePath="..\..\include\wx\msw\init.h" + > + </File> <File RelativePath="..\..\include\wx\msw\joystick.h" > @@ -6003,6 +6067,10 @@ RelativePath="..\..\include\wx\msw\msvcrt.h" > </File> + <File + RelativePath="..\..\include\wx\msw\nonownedwnd.h" + > + </File> <File RelativePath="..\..\include\wx\msw\notebook.h" > @@ -6023,6 +6091,10 @@ RelativePath="..\..\include\wx\msw\palette.h" > </File> + <File + RelativePath="..\..\include\wx\msw\panel.h" + > + </File> <File RelativePath="..\..\include\wx\msw\pen.h" > @@ -6067,10 +6139,6 @@ RelativePath="..\..\include\wx\msw\scrolbar.h" > </File> - <File - RelativePath="..\..\include\wx\msw\setup0.h" - > - </File> <File RelativePath="..\..\include\wx\msw\slider.h" > @@ -6123,6 +6191,10 @@ RelativePath="..\..\include\wx\msw\tglbtn.h" > </File> + <File + RelativePath="..\..\include\wx\msw\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\msw\toolbar.h" > @@ -6151,6 +6223,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" > @@ -6212,6 +6292,10 @@ RelativePath="..\..\include\wx\generic\ctrlsub.h" > </File> + <File + RelativePath="..\..\include\wx\generic\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\generic\dataview.h" > @@ -6396,6 +6480,10 @@ RelativePath="..\..\include\wx\generic\textdlgg.h" > </File> + <File + RelativePath="..\..\include\wx\generic\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\generic\treectlg.h" > @@ -6409,6 +6497,10 @@ Name="wxUniv Headers" UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}" > + <File + RelativePath="..\..\include\wx\univ\anybutton.h" + > + </File> <File RelativePath="..\..\include\wx\univ\app.h" > @@ -6449,6 +6541,10 @@ RelativePath="..\..\include\wx\univ\control.h" > </File> + <File + RelativePath="..\..\include\wx\univ\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\univ\dialog.h" > @@ -6485,6 +6581,10 @@ RelativePath="..\..\include\wx\univ\notebook.h" > </File> + <File + RelativePath="..\..\include\wx\univ\panel.h" + > + </File> <File RelativePath="..\..\include\wx\univ\radiobox.h" > @@ -6659,6 +6759,14 @@ RelativePath="..\..\include\wx\propgrid\advprops.h" > </File> + <File + RelativePath="..\..\include\wx\affinematrix2d.h" + > + </File> + <File + RelativePath="..\..\include\wx\affinematrix2dbase.h" + > + </File> <File RelativePath="..\..\include\wx\anidecod.h" > @@ -6671,6 +6779,10 @@ RelativePath="..\..\include\wx\animdecod.h" > </File> + <File + RelativePath="..\..\include\wx\anybutton.h" + > + </File> <File RelativePath="..\..\include\wx\ribbon\art.h" > @@ -6695,6 +6807,10 @@ RelativePath="..\..\include\wx\aui\auibook.h" > </File> + <File + RelativePath="..\..\include\wx\bannerwindow.h" + > + </File> <File RelativePath="..\..\include\wx\ribbon\bar.h" > @@ -6835,6 +6951,10 @@ RelativePath="..\..\include\wx\cursor.h" > </File> + <File + RelativePath="..\..\include\wx\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\dataobj.h" > @@ -6851,6 +6971,10 @@ RelativePath="..\..\include\wx\dateevt.h" > </File> + <File + RelativePath="..\..\include\wx\datetimectrl.h" + > + </File> <File RelativePath="..\..\include\wx\dc.h" > @@ -7155,6 +7279,10 @@ RelativePath="..\..\include\wx\infobar.h" > </File> + <File + RelativePath="..\..\include\wx\itemid.h" + > + </File> <File RelativePath="..\..\include\wx\joystick.h" > @@ -7375,14 +7503,34 @@ RelativePath="..\..\include\wx\richmsgdlg.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextborderspage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextbuffer.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextbulletspage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextctrl.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextdialogpage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextfontpage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextformatdlg.h" > @@ -7395,14 +7543,34 @@ RelativePath="..\..\include\wx\richtext\richtextimagedlg.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextindentspage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextliststylepage.h" + > + </File> + <File + RelativePath="..\..\include\wx\richtext\richtextmarginspage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextprint.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextsizepage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextstyledlg.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextstylepage.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextstyles.h" > @@ -7411,10 +7579,18 @@ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtextuicustomization.h" + > + </File> <File RelativePath="..\..\include\wx\richtext\richtextxml.h" > </File> + <File + RelativePath="..\..\include\wx\richtooltip.h" + > + </File> <File RelativePath="..\..\include\wx\sashwin.h" > @@ -7463,6 +7639,10 @@ RelativePath="..\..\include\wx\splash.h" > </File> + <File + RelativePath="..\..\include\wx\persist\splitter.h" + > + </File> <File RelativePath="..\..\include\wx\splitter.h" > @@ -7495,6 +7675,10 @@ RelativePath="..\..\include\wx\stc\stc.h" > </File> + <File + RelativePath="..\..\include\wx\aui\tabart.h" + > + </File> <File RelativePath="..\..\include\wx\aui\tabmdi.h" > @@ -7507,6 +7691,10 @@ RelativePath="..\..\include\wx\tbarbase.h" > </File> + <File + RelativePath="..\..\include\wx\textcompleter.h" + > + </File> <File RelativePath="..\..\include\wx\textctrl.h" > @@ -7527,6 +7715,10 @@ RelativePath="..\..\include\wx\tglbtn.h" > </File> + <File + RelativePath="..\..\include\wx\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\tipdlg.h" > @@ -7575,6 +7767,10 @@ RelativePath="..\..\include\wx\treectrl.h" > </File> + <File + RelativePath="..\..\include\wx\treelist.h" + > + </File> <File RelativePath="..\..\include\wx\uiaction.h" > @@ -7611,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" > @@ -7623,6 +7827,10 @@ RelativePath="..\..\include\wx\windowid.h" > </File> + <File + RelativePath="..\..\include\wx\withimages.h" + > + </File> <File RelativePath="..\..\include\wx\wizard.h" > @@ -7647,6 +7855,10 @@ RelativePath="..\..\include\wx\xrc\xh_animatctrl.h" > </File> + <File + RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h" + > + </File> <File RelativePath="..\..\include\wx\xrc\xh_bmp.h" > @@ -7859,6 +8071,10 @@ RelativePath="..\..\include\wx\xrc\xh_tglbtn.h" > </File> + <File + RelativePath="..\..\include\wx\xrc\xh_timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\xrc\xh_toolb.h" >