X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea98f11c2fbcd33ffc9b9771b8046c7353f51fcf..445a98c7d2e4341603d4d8d2384c19ab9cd04ccc:/build/msw/wx_vc8_core.vcproj diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 04728f4f7b..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\wxmsw292ud_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=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" /> @@ -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\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 @@ -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\wxmsw292u_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=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" /> @@ -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\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" @@ -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\wxmswuniv292ud_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=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" /> @@ -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\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 @@ -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\wxmswuniv292u_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=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" /> @@ -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\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" @@ -746,6 +746,10 @@ RelativePath="..\..\src\common\accesscmn.cpp" > </File> + <File + RelativePath="..\..\src\common\affinematrix2d.cpp" + > + </File> <File RelativePath="..\..\src\common\anidecod.cpp" > @@ -1395,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" > @@ -2535,6 +2559,10 @@ ExcludedFromBuild="true" /> </File> + <File + RelativePath="..\..\src\msw\nonownedwnd.cpp" + > + </File> <File RelativePath="..\..\src\msw\notebook.cpp" > @@ -3804,10 +3832,6 @@ RelativePath="..\..\src\generic\numdlgg.cpp" > </File> - <File - RelativePath="..\..\src\generic\panelg.cpp" - > - </File> <File RelativePath="..\..\src\generic\printps.cpp" > @@ -5675,6 +5699,10 @@ RelativePath="..\..\include\wx\msw\ole\activex.h" > </File> + <File + RelativePath="..\..\include\wx\msw\anybutton.h" + > + </File> <File RelativePath="..\..\include\wx\msw\app.h" > @@ -5759,6 +5787,10 @@ RelativePath="..\..\include\wx\msw\cursor.h" > </File> + <File + RelativePath="..\..\include\wx\msw\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\msw\ole\dataform.h" > @@ -5775,6 +5807,10 @@ RelativePath="..\..\include\wx\msw\datectrl.h" > </File> + <File + RelativePath="..\..\include\wx\msw\datetimectrl.h" + > + </File> <File RelativePath="..\..\include\wx\msw\dc.h" > @@ -6031,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" > @@ -6155,6 +6195,10 @@ RelativePath="..\..\include\wx\msw\tglbtn.h" > </File> + <File + RelativePath="..\..\include\wx\msw\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\msw\toolbar.h" > @@ -6183,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" > @@ -6244,6 +6296,10 @@ RelativePath="..\..\include\wx\generic\ctrlsub.h" > </File> + <File + RelativePath="..\..\include\wx\generic\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\generic\dataview.h" > @@ -6428,6 +6484,10 @@ RelativePath="..\..\include\wx\generic\textdlgg.h" > </File> + <File + RelativePath="..\..\include\wx\generic\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\generic\treectlg.h" > @@ -6441,6 +6501,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" > @@ -6481,6 +6545,10 @@ RelativePath="..\..\include\wx\univ\control.h" > </File> + <File + RelativePath="..\..\include\wx\univ\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\univ\dialog.h" > @@ -6695,6 +6763,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" > @@ -6707,6 +6783,10 @@ RelativePath="..\..\include\wx\animdecod.h" > </File> + <File + RelativePath="..\..\include\wx\anybutton.h" + > + </File> <File RelativePath="..\..\include\wx\ribbon\art.h" > @@ -6731,6 +6811,10 @@ RelativePath="..\..\include\wx\aui\auibook.h" > </File> + <File + RelativePath="..\..\include\wx\bannerwindow.h" + > + </File> <File RelativePath="..\..\include\wx\ribbon\bar.h" > @@ -6871,6 +6955,10 @@ RelativePath="..\..\include\wx\cursor.h" > </File> + <File + RelativePath="..\..\include\wx\custombgwin.h" + > + </File> <File RelativePath="..\..\include\wx\dataobj.h" > @@ -6887,6 +6975,10 @@ RelativePath="..\..\include\wx\dateevt.h" > </File> + <File + RelativePath="..\..\include\wx\datetimectrl.h" + > + </File> <File RelativePath="..\..\include\wx\dc.h" > @@ -7191,6 +7283,10 @@ RelativePath="..\..\include\wx\infobar.h" > </File> + <File + RelativePath="..\..\include\wx\itemid.h" + > + </File> <File RelativePath="..\..\include\wx\joystick.h" > @@ -7411,14 +7507,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" > @@ -7431,14 +7547,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" > @@ -7447,10 +7583,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" > @@ -7499,6 +7643,10 @@ RelativePath="..\..\include\wx\splash.h" > </File> + <File + RelativePath="..\..\include\wx\persist\splitter.h" + > + </File> <File RelativePath="..\..\include\wx\splitter.h" > @@ -7544,10 +7692,10 @@ > </File> <File - RelativePath="..\..\include\wx\textcompleter.h" - > - </File> - <File + RelativePath="..\..\include\wx\textcompleter.h" + > + </File> + <File RelativePath="..\..\include\wx\textctrl.h" > </File> @@ -7567,6 +7715,10 @@ RelativePath="..\..\include\wx\tglbtn.h" > </File> + <File + RelativePath="..\..\include\wx\timectrl.h" + > + </File> <File RelativePath="..\..\include\wx\tipdlg.h" > @@ -7615,6 +7767,10 @@ RelativePath="..\..\include\wx\treectrl.h" > </File> + <File + RelativePath="..\..\include\wx\treelist.h" + > + </File> <File RelativePath="..\..\include\wx\uiaction.h" > @@ -7651,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" > @@ -7663,6 +7827,10 @@ RelativePath="..\..\include\wx\windowid.h" > </File> + <File + RelativePath="..\..\include\wx\withimages.h" + > + </File> <File RelativePath="..\..\include\wx\wizard.h" > @@ -7687,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" > @@ -7899,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" >