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:
@@ -44,8 +44,10 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
WX_VERSION = 2.5.2
|
||||
WX_RELEASE = 2.5
|
||||
WX_RELEASE_NODOT = 25
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
|
||||
RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
@@ -71,8 +73,8 @@ RENDDLL_OBJECTS = \
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = 252
|
||||
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = 2.5.2
|
||||
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT)
|
||||
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
|
||||
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
|
||||
@COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
|
||||
@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX =
|
||||
@@ -109,13 +111,13 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-2.5$(HOST_SUFFIX)
|
||||
-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)
|
||||
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