X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3239c2118f2ab27516ee9662a1707ba7d8f9a7b..0d57a51305a86bff453adf302aa6ea2dedd46787:/build/msw/wx_vc8_stc.vcproj?ds=sidebyside
diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
index 02d8c357f1..4be9f99714 100644
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -2,7 +2,7 @@
<!--
This project was generated by
- Bakefile 0.2.6 (http://www.bakefile.org)
+ Bakefile 0.2.9 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -44,14 +44,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -73,7 +73,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -129,14 +129,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -155,7 +155,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -211,14 +211,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -240,7 +240,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -296,14 +296,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -322,7 +322,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -378,14 +378,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -396,7 +396,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -407,7 +407,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw291ud_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_stc_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -472,14 +472,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -487,7 +487,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
ObjectFile="vc_mswudll\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -498,7 +498,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -509,15 +509,17 @@
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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.dll"
- LinkIncremental="2"
+ OutputFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.dll"
+ LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_stc_vc_custom.pdb"
TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
/>
<Tool
Name="VCALinkTool"
@@ -563,14 +565,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ 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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ 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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
MinimalRebuild="true"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -581,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivuddll\wxprec_stcdll.pch"
ObjectFile="vc_mswunivuddll\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -592,7 +594,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -603,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\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_stc_vc_custom.pdb"
TargetMachine="1"
/>
<Tool
@@ -657,14 +659,14 @@
/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ 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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
<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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
- PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ 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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
@@ -672,7 +674,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswunivudll\wxprec_stcdll.pch"
ObjectFile="vc_mswunivudll\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -683,7 +685,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
Culture="1033"
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
/>
@@ -694,15 +696,17 @@
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\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
- OutputFile="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.dll"
- LinkIncremental="2"
+ OutputFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.dll"
+ LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_stc_vc_custom.pdb"
TargetMachine="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
/>
<Tool
Name="VCALinkTool"
@@ -833,124 +837,116 @@
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
>
<File
- RelativePath="..\..\include\wx\univ\setup.h"
+ RelativePath="..\..\include\wx\msw\setup.h"
>
<FileConfiguration
Name="Debug|Win32"
- />
- <FileConfiguration
- Name="Release|Win32"
- />
- <FileConfiguration
- Name="Universal Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"
+ Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="Universal Release|Win32"
+ Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"
+ Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="DLL Debug|Win32"
+ Name="Universal Debug|Win32"
/>
<FileConfiguration
- Name="DLL Release|Win32"
+ Name="Universal Release|Win32"
/>
<FileConfiguration
- Name="DLL Universal Debug|Win32"
+ Name="DLL Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"
+ Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="DLL Universal Release|Win32"
+ Name="DLL Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"
+ Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32"
+ />
+ <FileConfiguration
+ Name="DLL Universal Release|Win32"
+ />
</File>
<File
- RelativePath="..\..\include\wx\msw\setup.h"
+ RelativePath="..\..\include\wx\univ\setup.h"
>
<FileConfiguration
Name="Debug|Win32"
+ />
+ <FileConfiguration
+ Name="Release|Win32"
+ />
+ <FileConfiguration
+ Name="Universal Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+ Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
+ Name="Universal Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"
- Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+ Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="Universal Debug|Win32"
+ Name="DLL Debug|Win32"
/>
<FileConfiguration
- Name="Universal Release|Win32"
+ Name="DLL Release|Win32"
/>
<FileConfiguration
- Name="DLL Debug|Win32"
+ Name="DLL Universal Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+ Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
/>
</FileConfiguration>
<FileConfiguration
- Name="DLL Release|Win32"
+ Name="DLL Universal Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
- Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"
- Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""
+ Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+ Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
/>
</FileConfiguration>
- <FileConfiguration
- Name="DLL Universal Debug|Win32"
- />
- <FileConfiguration
- Name="DLL Universal Release|Win32"
- />
</File>
</Filter>
<Filter