diff --git a/Makefile.in b/Makefile.in
index 482cf73d26..09b5a4fc08 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,8 +81,8 @@ wxCFLAGS_C99 = @wxCFLAGS_C99@
DESTDIR =
WX_RELEASE = 3.1
WX_RELEASE_NODOT = 31
-WX_VERSION = $(WX_RELEASE).5
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_VERSION = $(WX_RELEASE).6
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
LIBDIRNAME = $(wx_top_builddir)/lib
WXREGEX_CFLAGS = $(WX_CPPFLAGS) -DNDEBUG -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(WX_CFLAGS) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
@@ -13829,17 +13829,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI
@COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).5
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .5.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).6
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .6.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).5.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).6.0.0
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .5.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -5.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .6.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -6.$(SO_SUFFIX)
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl
index d2ba19a445..f8d17f31cc 100644
--- a/build/bakefiles/version.bkl
+++ b/build/bakefiles/version.bkl
@@ -22,7 +22,7 @@
3. Else, i.e. if there were no changes at all to API but only internal
changes, change C:R:A to C:R+1:A
-->
- 5
+ 6
0
0
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 6ff7d9af53..97615a6bfe 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -32,7 +32,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)" WINDRES="$(WINDRES)"
CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
COMPILER_PREFIX = gcc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -5903,7 +5903,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
- @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)
+ @echo WXVER_RELEASE=6 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 792479410b..859e1342e2 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -31,7 +31,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
RUNTIME_LIBS="$(RUNTIME_LIBS)"
WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
COMPILER_PREFIX = vc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
@@ -6363,7 +6363,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
build_cfg_file: $(SETUPHDIR)
@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
- @echo WXVER_RELEASE=5 >>$(BUILD_CFG_FILE)
+ @echo WXVER_RELEASE=6 >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props
index ccb9785bd9..9ac5a6dc91 100644
--- a/build/msw/wx_setup.props
+++ b/build/msw/wx_setup.props
@@ -5,7 +5,7 @@
- 315
+ 316
31
msw
vc
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 824719246f..a6bc05a656 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -156,7 +156,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
ObjectFile="vc_mswuddll\adv\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.pdb"
TargetMachine="1"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,7 +254,7 @@
Name="VCPreLinkEventTool"/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_adv_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
ObjectFile="vc_mswuddll_x64\adv\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
index 7b36b39f11..43600fc8d0 100644
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
ObjectFile="vc_mswuddll\aui\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_aui_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
ObjectFile="vc_mswuddll_x64\aui\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 42af410687..8d1ff55d45 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
ObjectFile="vc_mswuddll\base\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase316ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315ud_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316ud_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315u_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315u_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316u_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
ObjectFile="vc_mswuddll_x64\base\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315ud_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315u_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315u_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 37736f92da..412248eaf4 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
ObjectFile="vc_mswuddll\core\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_core_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
ObjectFile="vc_mswuddll_x64\core\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj
index 72a5a3dcc7..615ed916e5 100644
--- a/build/msw/wx_vc8_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
ObjectFile="vc_mswuddll\gl\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_gl_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
ObjectFile="vc_mswuddll_x64\gl\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj
index 2721ba586d..f924e3c195 100644
--- a/build/msw/wx_vc8_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll\html\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_html_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll_x64\html\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj
index 475e7cdcee..ab5007b027 100644
--- a/build/msw/wx_vc8_media.vcproj
+++ b/build/msw/wx_vc8_media.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll\media\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_media_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll_x64\media\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index 57ed16fddd..399204225a 100644
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
ObjectFile="vc_mswuddll\net\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315ud_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315u_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315u_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316u_net_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
ObjectFile="vc_mswuddll_x64\net\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315ud_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315u_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315u_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj
index 66fb11e03f..7e8a8f8064 100644
--- a/build/msw/wx_vc8_propgrid.vcproj
+++ b/build/msw/wx_vc8_propgrid.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll\propgrid\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_propgrid_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll_x64\propgrid\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj
index b5350e3530..dddf269fb5 100644
--- a/build/msw/wx_vc8_qa.vcproj
+++ b/build/msw/wx_vc8_qa.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
ObjectFile="vc_mswuddll\qa\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_qa_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
ObjectFile="vc_mswuddll_x64\qa\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_qa_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj
index 4ca130c47c..8ac1da2860 100644
--- a/build/msw/wx_vc8_ribbon.vcproj
+++ b/build/msw/wx_vc8_ribbon.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll\ribbon\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_ribbon_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll_x64\ribbon\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj
index ff79f74fcd..0ce4845298 100644
--- a/build/msw/wx_vc8_richtext.vcproj
+++ b/build/msw/wx_vc8_richtext.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_richtext_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_richtext_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll_x64\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_richtext_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
index d6968ba525..a0471d37a1 100644
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib imm32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_stc_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib imm32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_stc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll_x64\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib imm32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib imm32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_stc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj
index 7185e6e5a4..46bb2b02d0 100644
--- a/build/msw/wx_vc8_webview.vcproj
+++ b/build/msw/wx_vc8_webview.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll\webview\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll_x64\webview\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj
index def28d3cdf..bcf61e6b6e 100644
--- a/build/msw/wx_vc8_xml.vcproj
+++ b/build/msw/wx_vc8_xml.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll\xml\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315ud_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315u_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315u_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316u_xml_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll_x64\xml\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315ud_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315u_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315u_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index c176c650cc..28bfb7ee26 100644
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -232,7 +232,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll\xrc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
/>
@@ -254,14 +254,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_xrc_vc_custom.pdb"
TargetMachine="1"
/>
@@ -345,14 +345,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_xrc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll_x64\xrc\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
/>
@@ -608,14 +608,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb"
TargetMachine="17"
/>
@@ -699,14 +699,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_xrc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index fdc7ace568..da994f8948 100644
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
ObjectFile="vc_mswuddll\adv\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_adv_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
ObjectFile="vc_mswuddll_x64\adv\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_adv_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_adv_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj
index ca15f2a9f5..5929334238 100644
--- a/build/msw/wx_vc9_aui.vcproj
+++ b/build/msw/wx_vc9_aui.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
ObjectFile="vc_mswuddll\aui\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_aui_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
ObjectFile="vc_mswuddll_x64\aui\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_aui_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_aui_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index b5481a71f9..793ada6bd6 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
ObjectFile="vc_mswuddll\base\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase316ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315ud_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316ud_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315u_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315u_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316u_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
ObjectFile="vc_mswuddll_x64\base\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315ud_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315ud_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315u_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315u_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 1d9d7d3078..5eb963685a 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
ObjectFile="vc_mswuddll\core\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_core_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
ObjectFile="vc_mswuddll_x64\core\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_core_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_core_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj
index 7e2cb1fdb0..7cee89b925 100644
--- a/build/msw/wx_vc9_gl.vcproj
+++ b/build/msw/wx_vc9_gl.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
ObjectFile="vc_mswuddll\gl\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_gl_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
ObjectFile="vc_mswuddll_x64\gl\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_gl_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_gl_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj
index 8dbd59045f..f50f13a67a 100644
--- a/build/msw/wx_vc9_html.vcproj
+++ b/build/msw/wx_vc9_html.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll\html\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_html_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
ObjectFile="vc_mswuddll_x64\html\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_html_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_html_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj
index c6ba90a1f3..4ce4db3962 100644
--- a/build/msw/wx_vc9_media.vcproj
+++ b/build/msw/wx_vc9_media.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll\media\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_media_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
ObjectFile="vc_mswuddll_x64\media\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_media_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_media_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj
index b4385ee1d9..f24a042b8f 100644
--- a/build/msw/wx_vc9_net.vcproj
+++ b/build/msw/wx_vc9_net.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
ObjectFile="vc_mswuddll\net\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315ud_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315u_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315u_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316u_net_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
ObjectFile="vc_mswuddll_x64\net\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315ud_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315ud_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315u_net_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315u_net_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj
index 534ccff25d..4443e63153 100644
--- a/build/msw/wx_vc9_propgrid.vcproj
+++ b/build/msw/wx_vc9_propgrid.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll\propgrid\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_propgrid_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
ObjectFile="vc_mswuddll_x64\propgrid\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_propgrid_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_propgrid_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj
index 46e32c671e..0283b4a94c 100644
--- a/build/msw/wx_vc9_qa.vcproj
+++ b/build/msw/wx_vc9_qa.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
ObjectFile="vc_mswuddll\qa\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_qa_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
ObjectFile="vc_mswuddll_x64\qa\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_qa_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_qa_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_qa_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_qa_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj
index 486bed405d..1851d1de90 100644
--- a/build/msw/wx_vc9_ribbon.vcproj
+++ b/build/msw/wx_vc9_ribbon.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll\ribbon\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_ribbon_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
ObjectFile="vc_mswuddll_x64\ribbon\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_ribbon_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_ribbon_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj
index d889a00b86..018a97f11f 100644
--- a/build/msw/wx_vc9_richtext.vcproj
+++ b/build/msw/wx_vc9_richtext.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_richtext_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_richtext_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
ObjectFile="vc_mswuddll_x64\richtext\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_richtext_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_richtext_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_richtext_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_richtext_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj
index 1eb41fdc28..c546d328de 100644
--- a/build/msw/wx_vc9_stc.vcproj
+++ b/build/msw/wx_vc9_stc.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib imm32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_stc_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib imm32.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_stc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
ObjectFile="vc_mswuddll_x64\stc\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib imm32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib imm32.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_stc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_stc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_stc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_stc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj
index a91ba72df8..ffedbaf347 100644
--- a/build/msw/wx_vc9_webview.vcproj
+++ b/build/msw/wx_vc9_webview.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll\webview\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
ObjectFile="vc_mswuddll_x64\webview\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_webview_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_webview_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj
index 22593a4199..d67d6359ec 100644
--- a/build/msw/wx_vc9_xml.vcproj
+++ b/build/msw/wx_vc9_xml.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll\xml\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315ud_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxbase315u_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxbase316u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxbase315u_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxbase316u_xml_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
ObjectFile="vc_mswuddll_x64\xml\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315ud_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315ud_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,14 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxbase315u_xml_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase315u_xml_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj
index 9c271743bc..aa84722339 100644
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -231,7 +231,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll\xrc\"
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -241,7 +241,7 @@
/>
@@ -252,14 +252,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315ud_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_xrc_vc_custom.pdb"
TargetMachine="1"
/>
@@ -343,14 +343,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_dll\wxmsw315u_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_dll\wxmsw316u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw315u_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_xrc_vc_custom.pdb"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
PrecompiledHeaderThrough="wx/wxprec.h"
PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
ObjectFile="vc_mswuddll_x64\xrc\"
- ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -593,7 +593,7 @@
/>
@@ -604,14 +604,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315ud_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.dll"
LinkIncremental="2"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315ud_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb"
TargetMachine="17"
/>
@@ -695,14 +695,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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
- OutputFile="..\..\lib\vc_x64_dll\wxmsw315u_xrc_vc_custom.dll"
+ OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_xrc_vc_custom.dll"
LinkIncremental="1"
ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw315u_xrc_vc_custom.pdb"
+ ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_xrc_vc_custom.pdb"
TargetMachine="17"
OptimizeReferences="2"
EnableCOMDATFolding="2"
diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig
index 505becab73..669b8cc5b9 100644
--- a/build/osx/wxvers.xcconfig
+++ b/build/osx/wxvers.xcconfig
@@ -1,4 +1,4 @@
// update this file with new version numbers
DYLIB_COMPATIBILITY_VERSION = 3.1
-DYLIB_CURRENT_VERSION = 3.1.5
+DYLIB_CURRENT_VERSION = 3.1.6
diff --git a/build/tools/msvs/getversion.bat b/build/tools/msvs/getversion.bat
index 5187fa7b90..ad41eaa90f 100644
--- a/build/tools/msvs/getversion.bat
+++ b/build/tools/msvs/getversion.bat
@@ -1,3 +1,3 @@
set wxMAJOR_VERSION=3
set wxMINOR_VERSION=1
-set wxRELEASE_NUMBER=5
+set wxRELEASE_NUMBER=6
diff --git a/configure b/configure
index 463a500b35..c59f0812f3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.5.
+# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.6.
#
# Report bugs to .
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='3.1.5'
-PACKAGE_STRING='wxWidgets 3.1.5'
+PACKAGE_VERSION='3.1.6'
+PACKAGE_STRING='wxWidgets 3.1.6'
PACKAGE_BUGREPORT='wx-dev@googlegroups.com'
PACKAGE_URL=''
@@ -1987,7 +1987,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wxWidgets 3.1.5 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 3.1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2057,7 +2057,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wxWidgets 3.1.5:";;
+ short | recursive ) echo "Configuration of wxWidgets 3.1.6:";;
esac
cat <<\_ACEOF
@@ -2547,7 +2547,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wxWidgets configure 3.1.5
+wxWidgets configure 3.1.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3364,7 +3364,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wxWidgets $as_me 3.1.5, which was
+It was created by wxWidgets $as_me 3.1.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3827,7 +3827,7 @@ fi
wx_major_version_number=3
wx_minor_version_number=1
-wx_release_number=5
+wx_release_number=6
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -41900,7 +41900,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wxWidgets $as_me 3.1.5, which was
+This file was extended by wxWidgets $as_me 3.1.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -41966,7 +41966,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-wxWidgets config.status 3.1.5
+wxWidgets config.status 3.1.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index c8b4eaeda5..a0827bd116 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ dnl ---------------------------------------------------------------------------
dnl initialization
dnl ---------------------------------------------------------------------------
-AC_INIT([wxWidgets], [3.1.5], [wx-dev@googlegroups.com])
+AC_INIT([wxWidgets], [3.1.6], [wx-dev@googlegroups.com])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in])
@@ -40,7 +40,7 @@ dnl wx_release_number += 1
wx_major_version_number=3
wx_minor_version_number=1
-wx_release_number=5
+wx_release_number=6
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index ce0a56db79..7de53d0968 100644
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
BOMBS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 0fd4b2de2a..3a37eced6d 100644
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
FORTY_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 708b1d9ea8..c24eb7b2ab 100644
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
FRACTAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index cf44ba7e75..c6d676a3ad 100644
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
LIFE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index 2e73e2033a..6fdc06b8b9 100644
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
WXPOEM_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 47f6c812f7..29cba9ba21 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -6,7 +6,7 @@
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = wxWidgets
-PROJECT_NUMBER = 3.1.5
+PROJECT_NUMBER = 3.1.6
PROJECT_BRIEF =
PROJECT_LOGO = logo.png
OUTPUT_DIRECTORY = out
diff --git a/docs/readme.txt b/docs/readme.txt
index dc745733cb..cf83e17068 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWidgets 3.1.5 Release Notes
+wxWidgets 3.1.6 Release Notes
=============================
Welcome to the latest development release of wxWidgets, a free and open source
@@ -16,7 +16,7 @@ more about wxWidgets at:
Documentation is available online at:
-* https://docs.wxwidgets.org/3.1.5/
+* https://docs.wxwidgets.org/3.1.6/
wxWidgets sources and binaries for the selected platforms are available for
download from:
@@ -25,9 +25,9 @@ download from:
or, for a more more permanent but less convenient to use link, from
-* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.5/
+* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.6/
-Please see https://docs.wxwidgets.org/3.1.5/overview_install.html for full
+Please see https://docs.wxwidgets.org/3.1.6/overview_install.html for full
installation instructions.
@@ -40,7 +40,7 @@ commits from 70 unique contributors (40 with multiple contributions), so it is
impossible to summarize all the changes in this document without making it too
long, please see the fuller changelog at
-https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.5/docs/changes.txt
+https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.6/docs/changes.txt
for more details, but here are some of the most important changes:
diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index c12b2d343b..cd68ec14f8 100644
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -124,9 +124,9 @@
#define PACKAGE_BUGREPORT "wx-dev@googlegroups.com"
#define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 3.1.5"
+#define PACKAGE_STRING "wxWidgets 3.1.6"
#define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "3.1.5"
+#define PACKAGE_VERSION "3.1.6"
// for regex
#define WX_NO_REGEX_ADVANCED 1
diff --git a/include/wx/version.h b/include/wx/version.h
index 46ab598afe..a5d8a030ba 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -27,9 +27,9 @@
/* NB: this file is parsed by automatic tools so don't change its format! */
#define wxMAJOR_VERSION 3
#define wxMINOR_VERSION 1
-#define wxRELEASE_NUMBER 5
+#define wxRELEASE_NUMBER 6
#define wxSUBRELEASE_NUMBER 0
-#define wxVERSION_STRING wxT("wxWidgets 3.1.5")
+#define wxVERSION_STRING wxT("wxWidgets 3.1.6")
/* nothing to update below this line when updating the version */
/* ---------------------------------------------------------------------------- */
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 4f8625da6d..3dbee50e6b 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
ACCESSTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 30df6faa2a..910a033337 100644
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
ANITEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index 7885a2d744..9b61e167b9 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
ARTTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index c201c74b45..b1929256b1 100644
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
AUIDEMO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 44a6265e03..52f58db08e 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
CALENDAR_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index af1e3b512a..7059b98941 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
CARET_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index dacc570524..f0ee684262 100644
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
CLIPBOARD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index f2dbac4f73..7135c7dedf 100644
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
COLLPANE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 4710cce014..dd8d6b455e 100644
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
COMBO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index e118f131bd..cc5403cf26 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
CONFTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index 2ccd2f532a..d0878b63cf 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DATAVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index b9746f057b..c9b42c97aa 100644
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DEBUGRPT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 9655bdb156..31dbd03121 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DIALOGS_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 8443fa422a..289619fe50 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
NETTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index e45d8a4cf4..956ba14f51 100644
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DISPLAY_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in
index 18f07698a4..31d19f43d7 100644
--- a/samples/dll/Makefile.in
+++ b/samples/dll/Makefile.in
@@ -50,7 +50,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
MY_DLL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index eb315da79f..8fdd26c0e0 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DND_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
index 7e9196037e..fb5948e04d 100644
--- a/samples/docview/Info.plist
+++ b/samples/docview/Info.plist
@@ -51,7 +51,7 @@
CFBundleExecutable
$(PRODUCT_NAME)
CFBundleGetInfoString
- $(PRODUCT_NAME) version 3.1.5, (c) 2005-2021 wxWidgets
+ $(PRODUCT_NAME) version 3.1.6, (c) 2005-2021 wxWidgets
CFBundleIconFile
doc
CFBundleIdentifier
@@ -66,17 +66,17 @@
it
CFBundleLongVersionString
- 3.1.5, (c) 2005-2021 wxWidgets
+ 3.1.6, (c) 2005-2021 wxWidgets
CFBundleName
$(PRODUCT_NAME)
CFBundlePackageType
APPL
CFBundleShortVersionString
- 3.1.5
+ 3.1.6
CFBundleSignature
WXMA
CFBundleVersion
- 3.1.5
+ 3.1.6
CSResourcesFileMapped
LSRequiresCarbon
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 7e9c865df3..76c85ce8be 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DOCVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index 8afb2dada7..c3364f09ba 100644
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DRAGIMAG_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 14abf167b2..ef792439b2 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
DRAWING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index e2204ebdba..93e113ee78 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
ERASE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index b95233d757..d0aae0ceae 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
EVENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index 601170660a..777292832c 100644
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
EXCEPT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index c6473daa10..92b722b792 100644
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
EXEC_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index bd3faca0eb..dd7d9d65d1 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
FONT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in
index 4fe1d4c042..cf8e82b2fb 100644
--- a/samples/fswatcher/Makefile.in
+++ b/samples/fswatcher/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
FSWATCHER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 4a04eb1ca3..575b364a47 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
GRID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 0fd03a64b8..fb91421396 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
HELP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 649277eeac..33d60dfd76 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
HTLBOX_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index e9e76a3e5e..dccf733891 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
ABOUT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index 5fc5f675b7..379bcf72e7 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
HTMLHELP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index b49ee4ae8a..dc094ff5fb 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
HELPVIEW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index c3e01b4085..aeeeba8064 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
HTMLPRINTING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index ded5f132ed..f372b0a34c 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
TEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 4e5c434725..d20877f854 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
VIRTUAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index a1ad1ab6bd..0d02dea67e 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
WIDGET_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 6853a1b25f..d8be5ef98a 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
ZIP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index c34e22bc47..efd472680e 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
IMAGE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 403721eb59..3558bc9696 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
INTERNAT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 8ee38f5586..77158029c3 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
IPCCLIENT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 21cf3ac49d..b3f4ffadb1 100644
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
JOYTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index d9762e2933..a25331a358 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
KEYBOARD_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 7784350f2b..d7f616a929 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
LAYOUT_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index bc2660bd87..b0b93e63ad 100644
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
LISTCTRL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 5aa0429676..4bdbd0c479 100644
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
MDI_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 1faefcfca2..0660072e9d 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
MEDIAPLAYER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index d5d99afbb0..72f7ad7b4e 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
MEMCHECK_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 6f428ff415..c276333fd1 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
MENU_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist
index 7aa17928eb..4d17a3e0d0 100644
--- a/samples/minimal/Info_cocoa.plist
+++ b/samples/minimal/Info_cocoa.plist
@@ -7,7 +7,7 @@
CFBundleExecutable
$(PRODUCT_NAME)
CFBundleGetInfoString
- $(PRODUCT_NAME) version 3.1.5, (c) 2005-2021 wxWidgets
+ $(PRODUCT_NAME) version 3.1.6, (c) 2005-2021 wxWidgets
CFBundleIconFile
wxmac.icns
CFBundleIdentifier
@@ -22,17 +22,17 @@
it
CFBundleLongVersionString
- 3.1.5, (c) 2005-2021 wxWidgets
+ 3.1.6, (c) 2005-2021 wxWidgets
CFBundleName
$(PRODUCT_NAME)
CFBundlePackageType
APPL
CFBundleShortVersionString
- 3.1.5
+ 3.1.6
CFBundleSignature
????
CFBundleVersion
- 3.1.5
+ 3.1.6
NSHumanReadableCopyright
Copyright 2005-2021 wxWidgets
NSPrincipalClass
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index b9f2eaa0be..14663726ff 100644
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
MINIMAL_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 3b422f56cf..5f129529f2 100644
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
NATIVDLG_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index c7e146f663..7de6e07f57 100644
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
NOTEBOOK_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index aa55d6986d..2160659866 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
OLEAUTO_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index 4e468e9915..2e9f7eb96d 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
CUBE_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index 0c9c2cf5c1..3947ea5451 100644
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
ISOSURF_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index b8039a43a8..1331bae61d 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
PENGUIN_CFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in
index d3060f2629..cb201d8d57 100644
--- a/samples/opengl/pyramid/Makefile.in
+++ b/samples/opengl/pyramid/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
PYRAMID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index d167ff8552..688facdcf0 100644
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
OWNERDRW_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index 9a6bb00ec2..58bcbd99a9 100644
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
POPUP_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index e8873be30b..ca862c3feb 100644
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
POWER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in
index f0d17509a0..f8fd8a0a51 100644
--- a/samples/preferences/Makefile.in
+++ b/samples/preferences/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
PREFERENCES_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index e6e0899f84..fe4b0534e6 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
PRINTING_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index ace75acf1a..2ac5e90b5f 100644
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
PROPGRID_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 6815fc955e..add3122321 100644
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).5
+WX_VERSION = $(WX_RELEASE).6
LIBDIRNAME = $(wx_top_builddir)/lib
REGTEST_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index fb73364a81..69c260a621 100644
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -53,8 +53,8 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_RELEASE_NODOT = 31
-WX_VERSION = $(WX_RELEASE).5
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_VERSION = $(WX_RELEASE).6
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
LIBDIRNAME = $(wx_top_builddir)/lib
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
RENDER_CXXFLAGS = $(WX_CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc
index 7fc270bf94..8a76933874 100644
--- a/samples/render/makefile.gcc
+++ b/samples/render/makefile.gcc
@@ -14,7 +14,7 @@ include ../../build/msw/config.gcc
CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
COMPILER_PREFIX = gcc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc
index e97535a7ca..452792e501 100644
--- a/samples/render/makefile.vc
+++ b/samples/render/makefile.vc
@@ -13,7 +13,7 @@
### Variables: ###
WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6
COMPILER_PREFIX = vc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj
index 979b40b7b1..672285353f 100644
--- a/samples/render/render_vc7_renddll.vcproj
+++ b/samples/render/render_vc7_renddll.vcproj
@@ -36,7 +36,7 @@
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswuddll\renddll\"
- ProgramDataBaseFileName="vc_mswuddll\renddll_mswud315_vc.pdb"
+ ProgramDataBaseFileName="vc_mswuddll\renddll_mswud316_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -47,12 +47,12 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib 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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="vc_mswuddll\renddll_mswud315_vc.dll"
+ OutputFile="vc_mswuddll\renddll_mswud316_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="vc_mswuddll\renddll_mswud315_vc.pdb"
+ ProgramDatabaseFile="vc_mswuddll\renddll_mswud316_vc.pdb"
TargetMachine="1"/>
diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj
index d99584a88c..b1474691fc 100644
--- a/samples/render/render_vc8_renddll.vcproj
+++ b/samples/render/render_vc8_renddll.vcproj
@@ -62,7 +62,7 @@
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll\renddll\"
- ProgramDataBaseFileName="vc_mswuddll\renddll_mswud315_vc.pdb"
+ ProgramDataBaseFileName="vc_mswuddll\renddll_mswud316_vc.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -84,13 +84,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib 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 shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
- OutputFile="vc_mswuddll\renddll_mswud315_vc.dll"
+ OutputFile="vc_mswuddll\renddll_mswud316_vc.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile="vc_mswuddll\renddll_mswud315_vc.pdb"
+ ProgramDatabaseFile="vc_mswuddll\renddll_mswud316_vc.pdb"
TargetMachine="1"
/>