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

Merge branch 'wxrc_flavour' of https://github.com/ardovm/wxWidgets

Browse Source 
Append WX_FLAVOUR to the name of wxrc executable.

See https://github.com/wxWidgets/wxWidgets/pull/2013
This commit is contained in:
Vadim Zeitlin 2020-08-21 02:40:55 +02:00
commit d8c308a4e0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/wxrc/wxrc.bkl
View File

@ -13,11 +13,11 @@
<if cond="FORMAT=='autoconf'">
<!-- Install wxrc as $prefix/bin/wxrc-$version with a wxrc symlink
pointing to it, so that users can use wxrc from different
<!-- Install wxrc as $prefix/bin/wxrc-$version$flavour with a wxrc
symlink pointing to it, so that users can use wxrc from different
versions. -->
<set var="versioned_name">wxrc-$(WX_RELEASE)</set>
<set var="versioned_name">wxrc-$(WX_RELEASE)$(WX_FLAVOUR)</set>
<modify-target target="install_wxrc">
<command>
rm -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)

18
wx-config.in
View File

@ -45,7 +45,8 @@ usage()
wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
[--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
[--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
[--debug[=yes|no]] [--version[=VERSION]] [--basename] [--cc] [--cxx]
[--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR]
[--basename] [--cc] [--cxx]
[--cppflags [base]] [--cxxflags [base]] [--cflags]
[--rescomp] [--linkdeps] [--ld] [--utility=UTIL]
[--libs [LIBS...]] [--optional-libs [LIBS...]]
@ -54,19 +55,20 @@ usage()
your system. It may be used to retrieve the information required to build
applications using these libraries using --cppflags, --cxxflags, --cflags,
and --libs options. And you may query the properties of this configuration
using --query-{host,toolkit,widgetset,chartype,debugtype,version,linkage}.
using --query-{host,toolkit,widgetset,chartype,debugtype,version,flavour,
linkage}.
NOTE: Usage of --debug and --query-debugtype are only relevant if you
have any versions prior to 2.9 installed and use the --version option to
select an earlier version.
If multiple builds of wxWidgets are available, you can use the options
--prefix, --host, --toolkit, --unicode, --static, --universal or --version
to select from them. The --selected-config option shows the name of the
current configuration and --list shows available alternatives which match
specified criteria. The --utility option returns the correct version of
UTIL to use with the selected build. The --linkdeps option returns only
static libraries for your makefile link rule dependencies.
--prefix, --host, --toolkit, --unicode, --static, --universal, --version
or --flavour to select from them. The --selected-config option shows the
name of the current configuration and --list shows available alternatives
which match specified criteria. The --utility option returns the correct
version of UTIL to use with the selected build. The --linkdeps option
returns only static libraries for your makefile link rule dependencies.
The LIBS arguments (comma or space separated) may be used to specify the
wxWidgets libraries that you wish to use. The "std" label may be used to