X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc118a9b0e3aa809cc8301a5b40f16f03b970b35..f16170b09fc2ea9c51a793d3703e3af22872c7d3:/build/msw/wx_vc9_core.vcproj diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index baf7e57388..3e070ac22e 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\wxmsw295ud_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=wxmsw295ud_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\wxmsw295ud_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\wxmsw295ud_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\wxmsw295u_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=wxmsw295u_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\wxmsw295u_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\wxmsw295u_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\wxmswuniv295ud_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=wxmswuniv295ud_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\wxmswuniv295ud_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\wxmswuniv295ud_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\wxmswuniv295u_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=wxmswuniv295u_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\wxmswuniv295u_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\wxmswuniv295u_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" > @@ -1118,6 +1122,10 @@ RelativePath="..\..\src\common\listctrlcmn.cpp" > </File> + <File + RelativePath="..\..\src\common\markupparser.cpp" + > + </File> <File RelativePath="..\..\src\common\matrix.cpp" > @@ -1258,6 +1266,10 @@ RelativePath="..\..\src\common\textentrycmn.cpp" > </File> + <File + RelativePath="..\..\src\common\textmeasurecmn.cpp" + > + </File> <File RelativePath="..\..\src\common\toplvcmn.cpp" > @@ -1387,6 +1399,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" > @@ -2527,6 +2559,10 @@ ExcludedFromBuild="true" /> </File> + <File + RelativePath="..\..\src\msw\nonownedwnd.cpp" + > + </File> <File RelativePath="..\..\src\msw\notebook.cpp" > @@ -2607,6 +2643,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" > @@ -2775,6 +2831,10 @@ ExcludedFromBuild="true" /> </File> + <File + RelativePath="..\..\src\msw\ole\safearray.cpp" + > + </File> <File RelativePath="..\..\src\msw\scrolbar.cpp" > @@ -3255,6 +3315,10 @@ ExcludedFromBuild="true" /> </File> + <File + RelativePath="..\..\src\msw\textmeasure.cpp" + > + </File> <File RelativePath="..\..\src\msw\tglbtn.cpp" > @@ -3390,27 +3454,15 @@ <File RelativePath="..\..\src\msw\uiaction.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\utilsgui.cpp" > </File> + <File + RelativePath="..\..\src\msw\utilswin.cpp" + > + </File> <File RelativePath="..\..\src\msw\ole\uuid.cpp" > @@ -3760,6 +3812,10 @@ RelativePath="..\..\src\generic\logg.cpp" > </File> + <File + RelativePath="..\..\src\generic\markuptext.cpp" + > + </File> <File RelativePath="..\..\src\generic\mdig.cpp" > @@ -3788,10 +3844,6 @@ RelativePath="..\..\src\generic\numdlgg.cpp" > </File> - <File - RelativePath="..\..\src\generic\panelg.cpp" - > - </File> <File RelativePath="..\..\src\generic\printps.cpp" > @@ -5659,6 +5711,10 @@ RelativePath="..\..\include\wx\msw\ole\activex.h" > </File> + <File + RelativePath="..\..\include\wx\msw\anybutton.h" + > + </File> <File RelativePath="..\..\include\wx\msw\app.h" > @@ -5743,6 +5799,10 @@ RelativePath="..\..\include\wx\msw\cursor.h" > </File> + <File + RelativePath="..\..\include\wx\msw\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\msw\ole\dataform.h" > @@ -5759,6 +5819,10 @@ RelativePath="..\..\include\wx\msw\datectrl.h" > </File> + <File + RelativePath="..\..\include\wx\msw\datetimectrl.h" + > + </File> <File RelativePath="..\..\include\wx\msw\dc.h" > @@ -5971,6 +6035,10 @@ RelativePath="..\..\include\wx\msw\iniconf.h" > </File> + <File + RelativePath="..\..\include\wx\msw\init.h" + > + </File> <File RelativePath="..\..\include\wx\msw\joystick.h" > @@ -6015,6 +6083,10 @@ RelativePath="..\..\include\wx\msw\msvcrt.h" > </File> + <File + RelativePath="..\..\include\wx\msw\nonownedwnd.h" + > + </File> <File RelativePath="..\..\include\wx\msw\notebook.h" > @@ -6035,6 +6107,10 @@ RelativePath="..\..\include\wx\msw\palette.h" > </File> + <File + RelativePath="..\..\include\wx\msw\panel.h" + > + </File> <File RelativePath="..\..\include\wx\msw\pen.h" > @@ -6076,11 +6152,11 @@ > </File> <File - RelativePath="..\..\include\wx\msw\scrolbar.h" + RelativePath="..\..\include\wx\msw\ole\safearray.h" > </File> <File - RelativePath="..\..\include\wx\msw\setup0.h" + RelativePath="..\..\include\wx\msw\scrolbar.h" > </File> <File @@ -6135,6 +6211,10 @@ RelativePath="..\..\include\wx\msw\tglbtn.h" > </File> + <File + RelativePath="..\..\include\wx\msw\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\msw\toolbar.h" > @@ -6163,6 +6243,18 @@ RelativePath="..\..\include\wx\msw\uxthemep.h" > </File> + <File + RelativePath="..\..\include\wx\msw\webview_ie.h" + > + </File> + <File + RelativePath="..\..\include\wx\msw\webview_missing.h" + > + </File> + <File + RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h" + > + </File> <File RelativePath="..\..\include\wx\msw\window.h" > @@ -6224,6 +6316,10 @@ RelativePath="..\..\include\wx\generic\ctrlsub.h" > </File> + <File + RelativePath="..\..\include\wx\generic\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\generic\dataview.h" > @@ -6408,6 +6504,10 @@ RelativePath="..\..\include\wx\generic\textdlgg.h" > </File> + <File + RelativePath="..\..\include\wx\generic\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\generic\treectlg.h" > @@ -6421,6 +6521,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" > @@ -6461,6 +6565,10 @@ RelativePath="..\..\include\wx\univ\control.h" > </File> + <File + RelativePath="..\..\include\wx\univ\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\univ\dialog.h" > @@ -6497,6 +6605,10 @@ RelativePath="..\..\include\wx\univ\notebook.h" > </File> + <File + RelativePath="..\..\include\wx\univ\panel.h" + > + </File> <File RelativePath="..\..\include\wx\univ\radiobox.h" > @@ -6671,6 +6783,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" > @@ -6683,6 +6803,10 @@ RelativePath="..\..\include\wx\animdecod.h" > </File> + <File + RelativePath="..\..\include\wx\anybutton.h" + > + </File> <File RelativePath="..\..\include\wx\ribbon\art.h" > @@ -6707,6 +6831,10 @@ RelativePath="..\..\include\wx\aui\auibook.h" > </File> + <File + RelativePath="..\..\include\wx\bannerwindow.h" + > + </File> <File RelativePath="..\..\include\wx\ribbon\bar.h" > @@ -6847,6 +6975,10 @@ RelativePath="..\..\include\wx\cursor.h" > </File> + <File + RelativePath="..\..\include\wx\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\dataobj.h" > @@ -6863,6 +6995,10 @@ RelativePath="..\..\include\wx\dateevt.h" > </File> + <File + RelativePath="..\..\include\wx\datetimectrl.h" + > + </File> <File RelativePath="..\..\include\wx\dc.h" > @@ -7167,6 +7303,10 @@ RelativePath="..\..\include\wx\infobar.h" > </File> + <File + RelativePath="..\..\include\wx\itemid.h" + > + </File> <File RelativePath="..\..\include\wx\joystick.h" > @@ -7387,14 +7527,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" > @@ -7407,14 +7567,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" > @@ -7423,10 +7603,22 @@ RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h" > </File> + <File + RelativePath="..\..\include\wx\richtext\richtexttabspage.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" > @@ -7451,6 +7643,10 @@ RelativePath="..\..\include\wx\settings.h" > </File> + <File + RelativePath="..\..\include\wx\simplebook.h" + > + </File> <File RelativePath="..\..\include\wx\sizer.h" > @@ -7475,6 +7671,10 @@ RelativePath="..\..\include\wx\splash.h" > </File> + <File + RelativePath="..\..\include\wx\persist\splitter.h" + > + </File> <File RelativePath="..\..\include\wx\splitter.h" > @@ -7507,6 +7707,10 @@ RelativePath="..\..\include\wx\stc\stc.h" > </File> + <File + RelativePath="..\..\include\wx\aui\tabart.h" + > + </File> <File RelativePath="..\..\include\wx\aui\tabmdi.h" > @@ -7519,6 +7723,10 @@ RelativePath="..\..\include\wx\tbarbase.h" > </File> + <File + RelativePath="..\..\include\wx\textcompleter.h" + > + </File> <File RelativePath="..\..\include\wx\textctrl.h" > @@ -7539,6 +7747,10 @@ RelativePath="..\..\include\wx\tglbtn.h" > </File> + <File + RelativePath="..\..\include\wx\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\tipdlg.h" > @@ -7587,6 +7799,10 @@ RelativePath="..\..\include\wx\treectrl.h" > </File> + <File + RelativePath="..\..\include\wx\treelist.h" + > + </File> <File RelativePath="..\..\include\wx\uiaction.h" > @@ -7623,6 +7839,18 @@ RelativePath="..\..\include\wx\vscroll.h" > </File> + <File + RelativePath="..\..\include\wx\webview.h" + > + </File> + <File + RelativePath="..\..\include\wx\webviewarchivehandler.h" + > + </File> + <File + RelativePath="..\..\include\wx\webviewfshandler.h" + > + </File> <File RelativePath="..\..\include\wx\persist\window.h" > @@ -7635,6 +7863,10 @@ RelativePath="..\..\include\wx\windowid.h" > </File> + <File + RelativePath="..\..\include\wx\withimages.h" + > + </File> <File RelativePath="..\..\include\wx\wizard.h" > @@ -7659,6 +7891,14 @@ RelativePath="..\..\include\wx\xrc\xh_animatctrl.h" > </File> + <File + RelativePath="..\..\include\wx\xrc\xh_auinotbk.h" + > + </File> + <File + RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h" + > + </File> <File RelativePath="..\..\include\wx\xrc\xh_bmp.h" > @@ -7815,6 +8055,14 @@ RelativePath="..\..\include\wx\xrc\xh_radbx.h" > </File> + <File + RelativePath="..\..\include\wx\xrc\xh_ribbon.h" + > + </File> + <File + RelativePath="..\..\include\wx\xrc\xh_richtext.h" + > + </File> <File RelativePath="..\..\include\wx\xrc\xh_scrol.h" > @@ -7871,6 +8119,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" > @@ -7899,6 +8151,10 @@ RelativePath="..\..\include\wx\xrc\xmlres.h" > </File> + <File + RelativePath="..\..\include\wx\xrc\xmlreshandler.h" + > + </File> <File RelativePath="..\..\include\wx\xpmdecod.h" > @@ -7908,6 +8164,16 @@ > </File> </Filter> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\src\xrc\xmlreshandler.cpp" + > + </File> + </Filter> </Files> <Globals>