diff --git a/Makefile.in b/Makefile.in index 33d2ae637e..fde734aef4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -82,8 +82,8 @@ wxCFLAGS_C99 = @wxCFLAGS_C99@ DESTDIR = WX_RELEASE = 3.1 WX_RELEASE_NODOT = 31 -WX_VERSION = $(WX_RELEASE).6 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6 +WX_VERSION = $(WX_RELEASE).7 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)7 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = $(WX_CPPFLAGS) -DNDEBUG \ -I$(wx_top_builddir)/3rdparty/pcre/src -D__WX__ -DHAVE_CONFIG_H \ @@ -13962,17 +13962,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).6 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .6.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).7 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .7.$(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).6.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).7.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@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_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .7.0.0.$(SO_SUFFIX) +@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -7.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).7 @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 f8d17f31cc..f12566d80e 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 --> - 6 + 7 0 0 diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 00dd6f4818..b880e9ae68 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)6 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)7 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -5983,7 +5983,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=6 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=7 >>$(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 d01748ffc8..4dff1acb09 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)6 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)7 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -6453,7 +6453,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=6 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=7 >>$(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 00cdf76721..33c70fa12c 100644 --- a/build/msw/wx_setup.props +++ b/build/msw/wx_setup.props @@ -5,7 +5,7 @@ - 316 + 317 31 msw vc diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj index 03dd4104b9..be604317b4 100644 --- a/build/msw/wx_vc8_adv.vcproj +++ b/build/msw/wx_vc8_adv.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_adv_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_advdll.pch" ObjectFile="vc_x64_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 959e1dc16d..58189d96ab 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\wxmsw316ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_auidll.pch" ObjectFile="vc_x64_mswuddll\aui\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 babb6afe45..7c575f60ac 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\wxbase316ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase316ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317ud_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\wxbase316ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase316u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317u_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\wxbase316u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_basedll.pch" ObjectFile="vc_x64_mswuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317ud_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\wxbase316ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317u_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\wxbase316u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317u_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 58af7fa24d..c33a284f18 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\wxmsw316ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_coredll.pch" ObjectFile="vc_x64_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 2e1aa97630..357409241b 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\wxmsw316ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_gldll.pch" ObjectFile="vc_x64_mswuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 61e8c5a63e..dec542edcf 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\wxmsw316ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_htmldll.pch" ObjectFile="vc_x64_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 63d71fa33c..0507d16774 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\wxmsw316ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_mediadll.pch" ObjectFile="vc_x64_mswuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 24e5d54c5a..2d3b55b150 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\wxbase316ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317ud_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\wxbase316ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase316u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317u_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\wxbase316u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_netdll.pch" ObjectFile="vc_x64_mswuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317ud_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\wxbase316ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317u_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\wxbase316u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317u_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 9d1261e66f..f9639a5d97 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\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_propgriddll.pch" ObjectFile="vc_x64_mswuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 b89c8821b1..f303048461 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\wxmsw316ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_qadll.pch" ObjectFile="vc_x64_mswuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 304cba1a90..2c557b2ff7 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\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_ribbondll.pch" ObjectFile="vc_x64_mswuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 b54c52ce4f..f20d516bac 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\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_richtextdll.pch" ObjectFile="vc_x64_mswuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 ea3c2dcbac..14931b6a44 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\wxmsw316ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_stcdll.pch" ObjectFile="vc_x64_mswuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 513dd8489c..3569f00a75 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\wxmsw316ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_webview_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_webviewdll.pch" ObjectFile="vc_x64_mswuddll\webview\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 a0b16dde48..091d165c9c 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\wxbase316ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317ud_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\wxbase316ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase316u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317u_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\wxbase316u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xmldll.pch" ObjectFile="vc_x64_mswuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317ud_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\wxbase316ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317u_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\wxbase316u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317u_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 91224e16d9..343866c9e9 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\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xrcdll.pch" ObjectFile="vc_x64_mswuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 93db269215..c440043269 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\wxmsw316ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_advdll.pch" ObjectFile="vc_x64_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 d5b947c535..82b4f5ce1b 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\wxmsw316ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_auidll.pch" ObjectFile="vc_x64_mswuddll\aui\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 8525268c93..0736398d55 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\wxbase316ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase316ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317ud_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\wxbase316ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase316u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317u_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\wxbase316u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_basedll.pch" ObjectFile="vc_x64_mswuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317ud_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\wxbase316ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316u_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317u_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\wxbase316u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317u_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 65bdd6cdbc..7ad29309b0 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\wxmsw316ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_coredll.pch" ObjectFile="vc_x64_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 b60c410edc..f50ec714ef 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\wxmsw316ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_gldll.pch" ObjectFile="vc_x64_mswuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 5ab7750475..ed21652906 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\wxmsw316ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_htmldll.pch" ObjectFile="vc_x64_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 14fbc5ca5d..0ea8ae4014 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\wxmsw316ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_mediadll.pch" ObjectFile="vc_x64_mswuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 128c1703f2..ac8d365efd 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\wxbase316ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase316ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317ud_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\wxbase316ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase316u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317u_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\wxbase316u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_netdll.pch" ObjectFile="vc_x64_mswuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317ud_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\wxbase316ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317u_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\wxbase316u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317u_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 95afec2c52..507ee1fb60 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\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_propgriddll.pch" ObjectFile="vc_x64_mswuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 7d45c9f931..30e87f3e5d 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\wxmsw316ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_qadll.pch" ObjectFile="vc_x64_mswuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 667fb6a363..9bc419d3b5 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\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_ribbondll.pch" ObjectFile="vc_x64_mswuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 1b4de21fc1..8870b7d910 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\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_richtextdll.pch" ObjectFile="vc_x64_mswuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 cecb7aff82..3d8cb8c761 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\wxmsw316ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_stcdll.pch" ObjectFile="vc_x64_mswuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 c430269f83..7618f92fda 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\wxmsw316ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw316u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_webview_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_webviewdll.pch" ObjectFile="vc_x64_mswuddll\webview\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll;..\..\3rdparty\webview2\build\native\x86" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw316u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_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 f933ee81b6..43ca6303ba 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\wxbase316ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase316ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317ud_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\wxbase316ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase316u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase317u_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\wxbase316u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase317u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xmldll.pch" ObjectFile="vc_x64_mswuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317ud_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\wxbase316ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317ud_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 ws2_32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase316u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase317u_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\wxbase316u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase317u_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 8e337fb20b..f3a1aa5832 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\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317ud_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\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw317u_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\wxmsw316u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw317u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_x64_mswuddll\wxprec_xrcdll.pch" ObjectFile="vc_x64_mswuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317ud_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\wxmsw316ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317ud_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 ws2_32.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\wxmsw316u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw317u_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\wxmsw316u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw317u_xrc_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 669b8cc5b9..8927dcfa7c 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.6 +DYLIB_CURRENT_VERSION = 3.1.7 diff --git a/build/tools/msvs/getversion.bat b/build/tools/msvs/getversion.bat index ad41eaa90f..bd3705a0b0 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=6 +set wxRELEASE_NUMBER=7 diff --git a/configure b/configure index ca1d5008f2..bc4d1db12f 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.6. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.7. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='3.1.6' -PACKAGE_STRING='wxWidgets 3.1.6' +PACKAGE_VERSION='3.1.7' +PACKAGE_STRING='wxWidgets 3.1.7' PACKAGE_BUGREPORT='wx-dev@googlegroups.com' PACKAGE_URL='' @@ -2005,7 +2005,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.6 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2075,7 +2075,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 3.1.6:";; + short | recursive ) echo "Configuration of wxWidgets 3.1.7:";; esac cat <<\_ACEOF @@ -2574,7 +2574,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 3.1.6 +wxWidgets configure 3.1.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3391,7 +3391,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.6, which was +It was created by wxWidgets $as_me 3.1.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3854,7 +3854,7 @@ fi wx_major_version_number=3 wx_minor_version_number=1 -wx_release_number=6 +wx_release_number=7 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -46402,7 +46402,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.6, which was +This file was extended by wxWidgets $as_me 3.1.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -46468,7 +46468,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.6 +wxWidgets config.status 3.1.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 25857cc08c..5c144b25f3 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [3.1.6], [wx-dev@googlegroups.com]) +AC_INIT([wxWidgets], [3.1.7], [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=6 +wx_release_number=7 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 24d0fea12e..61e4cb6b82 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).6 +WX_VERSION = $(WX_RELEASE).7 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 382dd259c0..50a2198589 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).6 +WX_VERSION = $(WX_RELEASE).7 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 03d1e95233..b0f2d9e168 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).6 +WX_VERSION = $(WX_RELEASE).7 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 ba19a3cd60..b864b0f369 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).6 +WX_VERSION = $(WX_RELEASE).7 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 ddcdf4ecf4..9f1ff8a433 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).6 +WX_VERSION = $(WX_RELEASE).7 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 41f8fed31e..1f7d36ffd2 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -6,7 +6,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 3.1.6 +PROJECT_NUMBER = 3.1.7 PROJECT_BRIEF = PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out diff --git a/docs/readme.txt b/docs/readme.txt index da3df1008d..8257bd0787 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 3.1.6 Release Notes +wxWidgets 3.1.7 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.6/ +* https://docs.wxwidgets.org/3.1.7/ 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.6/ +* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.7/ -Please see https://docs.wxwidgets.org/3.1.6/overview_install.html for full +Please see https://docs.wxwidgets.org/3.1.7/overview_install.html for full installation instructions. @@ -40,7 +40,7 @@ commits from 82 unique contributors (41 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.6/docs/changes.txt +https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.7/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 a4be7b9df0..6ed3453877 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.6" +#define PACKAGE_STRING "wxWidgets 3.1.7" #define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "3.1.6" +#define PACKAGE_VERSION "3.1.7" // for jpeg diff --git a/include/wx/version.h b/include/wx/version.h index a5d8a030ba..8ab4dda6c7 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 6 +#define wxRELEASE_NUMBER 7 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.1.6") +#define wxVERSION_STRING wxT("wxWidgets 3.1.7") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index dd3c640fa7..c13bc9fcd9 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).6 +WX_VERSION = $(WX_RELEASE).7 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 4deb8e6d5a..e2067d73e8 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).6 +WX_VERSION = $(WX_RELEASE).7 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 86dd8c6314..4a7ebdb463 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).6 +WX_VERSION = $(WX_RELEASE).7 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 0a1b94cc87..ac0a829245 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).6 +WX_VERSION = $(WX_RELEASE).7 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 427bafd42c..2e174c6b5f 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).6 +WX_VERSION = $(WX_RELEASE).7 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 7c9ee2b4c2..0931433753 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).6 +WX_VERSION = $(WX_RELEASE).7 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 963cbf9185..630bf1c624 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).6 +WX_VERSION = $(WX_RELEASE).7 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 3f6aa6006b..e13d3fa56a 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).6 +WX_VERSION = $(WX_RELEASE).7 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 0286a6297e..404b34a459 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).6 +WX_VERSION = $(WX_RELEASE).7 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 d8e3ad664a..192eea6623 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).6 +WX_VERSION = $(WX_RELEASE).7 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 88829b4343..95e292ffb5 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).6 +WX_VERSION = $(WX_RELEASE).7 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 3dc17a3eee..273cbc2202 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).6 +WX_VERSION = $(WX_RELEASE).7 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 e1a3e21b43..04daa30252 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).6 +WX_VERSION = $(WX_RELEASE).7 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 73c55b5def..5651cd0adc 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).6 +WX_VERSION = $(WX_RELEASE).7 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 a6a4d3e540..b22265a170 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).6 +WX_VERSION = $(WX_RELEASE).7 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 e4f340eb57..46f210736f 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).6 +WX_VERSION = $(WX_RELEASE).7 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 f8a35e6351..f01d00fa9f 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).6 +WX_VERSION = $(WX_RELEASE).7 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/Makefile.in b/samples/docview/Makefile.in index 570fe57419..773032bfab 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).6 +WX_VERSION = $(WX_RELEASE).7 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 9d3f2ea855..a886d00b0b 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).6 +WX_VERSION = $(WX_RELEASE).7 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 0c5ba9b941..b5641b42df 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).6 +WX_VERSION = $(WX_RELEASE).7 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 efe6fe72e5..b3c0c8feb0 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).6 +WX_VERSION = $(WX_RELEASE).7 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 96eabad547..cb369798a9 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).6 +WX_VERSION = $(WX_RELEASE).7 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 f8f8018e6d..8b20218e81 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).6 +WX_VERSION = $(WX_RELEASE).7 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 e55c112dc3..5a5ac0b2cc 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).6 +WX_VERSION = $(WX_RELEASE).7 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 e5a2646234..89a9b1b377 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).6 +WX_VERSION = $(WX_RELEASE).7 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 3b32cbca32..f0f2a17e02 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).6 +WX_VERSION = $(WX_RELEASE).7 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 12d4f9126f..1f02bac805 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).6 +WX_VERSION = $(WX_RELEASE).7 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 e3884e1f96..596754491d 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).6 +WX_VERSION = $(WX_RELEASE).7 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 e95c26354a..0f627932e3 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).6 +WX_VERSION = $(WX_RELEASE).7 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 9f2b476d56..b72edcd8dd 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).6 +WX_VERSION = $(WX_RELEASE).7 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 17195570a6..7b24f297fb 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).6 +WX_VERSION = $(WX_RELEASE).7 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 1a07607d4d..d439e06802 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).6 +WX_VERSION = $(WX_RELEASE).7 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 7addc07393..22942c0e2c 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).6 +WX_VERSION = $(WX_RELEASE).7 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 4d74a3695f..253c931836 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).6 +WX_VERSION = $(WX_RELEASE).7 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 212a00e116..9d975c22ce 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).6 +WX_VERSION = $(WX_RELEASE).7 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 f8e7de052d..1a092e41a4 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).6 +WX_VERSION = $(WX_RELEASE).7 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 98f26bf55c..64b3789dd5 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).6 +WX_VERSION = $(WX_RELEASE).7 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 1931efebc2..b678accccc 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).6 +WX_VERSION = $(WX_RELEASE).7 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 9b97a160f1..ba6b75227f 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).6 +WX_VERSION = $(WX_RELEASE).7 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 a38188d9ec..90d88434ec 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).6 +WX_VERSION = $(WX_RELEASE).7 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 d667c7310c..2a1e934ed8 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).6 +WX_VERSION = $(WX_RELEASE).7 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 952c4fbc44..5404186979 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).6 +WX_VERSION = $(WX_RELEASE).7 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 803fbffd2a..221ffb7936 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).6 +WX_VERSION = $(WX_RELEASE).7 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 c8b69d0f05..188b9b7428 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).6 +WX_VERSION = $(WX_RELEASE).7 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 f717486c31..9ff632b1cf 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).6 +WX_VERSION = $(WX_RELEASE).7 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 816c5a9363..7f94b2c7a5 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).6 +WX_VERSION = $(WX_RELEASE).7 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 44448deea8..d71a6148c7 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).6 +WX_VERSION = $(WX_RELEASE).7 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 c204c75a37..e70a545b7d 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).6 +WX_VERSION = $(WX_RELEASE).7 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 7c8d1ba5fd..f911663544 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.6, (c) 2005-2022 wxWidgets + $(PRODUCT_NAME) version 3.1.7, (c) 2005-2022 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,15 +15,15 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 3.1.6, (c) 2005-2022 wxWidgets + 3.1.7, (c) 2005-2022 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.1.6 + 3.1.7 CFBundleVersion - 3.1.6 + 3.1.7 NSHumanReadableCopyright Copyright 2005-2022 wxWidgets NSPrincipalClass diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 0226ad09a3..2866ae7a99 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).6 +WX_VERSION = $(WX_RELEASE).7 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 33715dcfc3..44060f98b9 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).6 +WX_VERSION = $(WX_RELEASE).7 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 2fd72b19d4..72644967d2 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).6 +WX_VERSION = $(WX_RELEASE).7 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 0ac9a2b69a..ac22f5b089 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).6 +WX_VERSION = $(WX_RELEASE).7 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 f40a5cc4c8..da87051d2c 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).6 +WX_VERSION = $(WX_RELEASE).7 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 6612f11e17..210525ad17 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).6 +WX_VERSION = $(WX_RELEASE).7 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 bf07273018..634fcbd316 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).6 +WX_VERSION = $(WX_RELEASE).7 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 47cb8302ba..547e488ebe 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).6 +WX_VERSION = $(WX_RELEASE).7 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 127ac9d60d..97cb6c9af5 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).6 +WX_VERSION = $(WX_RELEASE).7 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 944b96a5e0..dfa36439ef 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).6 +WX_VERSION = $(WX_RELEASE).7 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 51a8eb9677..ef14419466 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).6 +WX_VERSION = $(WX_RELEASE).7 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 3aee6c153d..7d3d283a64 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).6 +WX_VERSION = $(WX_RELEASE).7 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 95b35a5d7f..dd9bf39c61 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).6 +WX_VERSION = $(WX_RELEASE).7 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 42bbfeb211..dbc73b274f 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).6 +WX_VERSION = $(WX_RELEASE).7 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 901d467dbf..72513eecce 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).6 +WX_VERSION = $(WX_RELEASE).7 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 704afc2e5f..4d9c7ff6bb 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).6 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)6 +WX_VERSION = $(WX_RELEASE).7 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)7 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 27d82e2df0..1b1bd2a068 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)6 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)7 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 667514e124..eda4d45858 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)6 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)7 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj index 628bf97300..b48170c4db 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_mswud316_vc.pdb" + ProgramDataBaseFileName="vc_mswuddll\renddll_mswud317_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 ws2_32.lib wininet.lib" - OutputFile="vc_mswuddll\renddll_mswud316_vc.dll" + OutputFile="vc_mswuddll\renddll_mswud317_vc.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswuddll\renddll_mswud316_vc.pdb" + ProgramDatabaseFile="vc_mswuddll\renddll_mswud317_vc.pdb" TargetMachine="1" />