Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increment version number to 3.1.4

Browse Source 
Done by running misc/scripts/inc_release, manually updating version.bkl,
rebaking and rerunning autoconf.

Also a header for the next version to the change log.
This commit is contained in:
Vadim Zeitlin
2019-10-28 14:11:00 +01:00
parent e8fbf9aa49
commit 0a02f4c190
180 changed files with 838 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/stc/Makefile.in
View File

@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 3.1
WX_VERSION = $(WX_RELEASE).3
WX_VERSION = $(WX_RELEASE).4
LIBDIRNAME = $(wx_top_builddir)/lib
STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -99,9 +99,9 @@ COND_PLATFORM_OS2_1___stctest___os2_emxbindcmd = $(NM) stctest$(EXEEXT) | if \
@COND_TOOLKIT_OSX_IPHONE@ = $(__stctest_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_COCOA@____stctest_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_COCOA@ $(__stctest_app_Contents_PkgInfo___depname)
COND_MONOLITHIC_0___WXLIB_STC_p = \
COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_STC_p = $(COND_MONOLITHIC_0___WXLIB_STC_p)
@COND_MONOLITHIC_0_USE_STC_1@__WXLIB_STC_p = $(COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p)
COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)

2
samples/stc/makefile.bcc
View File

@@ -165,7 +165,7 @@ __DLLFLAG_p = -DWXUSINGDLL
!if "$(SHARED)" == "1"
__DLLFLAG_p_1 = -dWXUSINGDLL
!endif
!if "$(MONOLITHIC)" == "0"
!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1"
__WXLIB_STC_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
!endif

2
samples/stc/makefile.vc
View File

@@ -315,7 +315,7 @@ __DLLFLAG_p = /DWXUSINGDLL
!if "$(SHARED)" == "1"
__DLLFLAG_p_1 = /d WXUSINGDLL
!endif
!if "$(MONOLITHIC)" == "0"
!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1"
__WXLIB_STC_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
!endif