Limit the influence of flavour more strictly to autoconf format.
Remove '-' and '.' from the $release tag for non autoconf platform. This may like slightly finer tuning than that for some people. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -59,10 +59,10 @@ HELPGEN_OBJECTS =  \ | ||||
| @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||||
| @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL | ||||
| COND_MONOLITHIC_0___WXLIB_BASE_p = \ | ||||
| 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX) | ||||
| 	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) | ||||
| COND_MONOLITHIC_1___WXLIB_MONO_p = \ | ||||
| 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX) | ||||
| 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user