# usage _exitcode
# Outputs a usage message to stderr and exits with _exitcode.
-# Try to keep this to a single page. We can add alternate help
-# targets if people want more detail from interactive help.
+# Try to keep this to a single page (ie. < 25 lines). We can add
+# alternate or interactive help targets if people want more detail.
+#
+# Exit codes are now subject to a more strict interpretation.
+# wx-config should return 0 upon successful operation, 1 if the
+# reqested operation could not be completed successfully, and 2
+# if the requested operation is not supported by this version of
+# wx-config.
usage()
{
cat 1>&2 <<EOF
wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
[--list] [--host=HOST] [--toolkit=TOOLKIT] [--universal[=yes|no]]
[--unicode[=yes|no]] [--debug[=yes|no]] [--static[=yes|no]]
- [--version[=VERSION]] [--basename] [--cppflags] [--cflags]
- [--cxxflags] [--rezflags] [--libs] [--cc] [--cxx] [--ld] [LIB ...]
+ [--version[=VERSION]] [--basename] [--cc] [--cppflags] [--cflags]
+ [--cxxflags] [--rezflags] [--libs] [--cxx] [--ld] [--linkdeps]
+ [--utility=UTIL] [LIB ...]
wx-config returns information about the wxWidgets libraries available
on your system. It may be used to retrieve the information you require
--version and --universal, to select from them. Use the --list option to
show alternatives available which match specified criteria. The unicode,
debug, and universal options take an optional yes or no argument, while
- host and version accept posix extended regex.
+ host and version accept posix extended regex. The --utility option will
+ return the correct version of UTIL to use with the selected library build.
+ --linkdeps returns only static libraries for your makefile link rule deps.
Optional LIB arguments (comma or space separated) may be used to specify
the wxWidgets libraries that you wish to use. The magic "std" label may
cppflags cflags cxxflags \
rezflags \
libs \
+ linkdeps \
cc cxx ld \
gl_libs"
# Options that permit the user to supply hints that may affect the output.
# These options all accept arbitrary values, to interpret as they please.
-wxconfig_input_options="prefix exec_prefix $wxconfig_schema"
+wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
# Input options that accept only a yes or no argument.
wxconfig_yesno_options="universal unicode debug static"
esac
decho " *** Error: Unrecognised option: '$arg'"
decho "Use wx-config --help for information on command line options."
- exit 1
+ exit 2
done
# validate_arg only checks and decomposes form. Sanity check the yes/no
# Returns a list of configs installed by wx2.4 releases.
find_legacy_configs()
{
- cd "$prefix/bin" 2> /dev/null && \
- ls wx*-2.4-config | grep -v ^wxbase; \
- ls wx*-2.4-config | grep ^wxbase
+ cd "$prefix/bin" 2> /dev/null && \
+ ls wx*-2.4-config 2> /dev/null | grep -v ^wxbase; \
+ ls wx*-2.4-config 2> /dev/null | grep ^wxbase
}
# find_best_legacy_config
[ -z "$output_option_version" ] || echo "@WX_VERSION@"
[ -z "$output_option_version_full" ] || echo "@WX_SUBVERSION@"
[ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@"
-[ -z "$output_option_rezflags" ] || echo $(eval echo @MACRESWXCONFIG@)
+[ -z "$output_option_rezflags" ] || echo $(eval echo "@MACRESWXCONFIG@")
[ -z "$output_option_cc" ] || echo "@CC@"
[ -z "$output_option_cxx" ] || echo "@CXX@"
[ -z "$output_option_ld" ] || echo "@EXE_LINKER@"
+[ -z "$input_option_utility" ] || echo "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@"
# The rest are going to need a little more work.
ldlibs_odbc="@EXTRALIBS_ODBC@"
ldlibs_adv="@EXTRALIBS_SDL@"
-
# lib_flags_for _liblist
# This function returns a list of flags suitable to return with the
# output of --libs for all of the libraries in _liblist. You can
echo $_all_ldflags $_wxlibs $_all_libs
}
+# this is the strict subset of the above function which returns only the
+# (static) libraries themselves: this is used for linkdeps output which should
+# output the list of libraries the main program should depend on
+#
+# of course, this duplication is bad but I'll leave to somebody else the care
+# of refactoring this as I don't see any way to do it
+link_deps_for()
+{
+ _wxlibs=''
+
+ ! is_cross || _target="-${target}"
+
+ for lib; do
+ if match_field "$lib" @CORE_BASE_LIBS@ ; then
+ _libname="@WX_LIBRARY_BASENAME_NOGUI@"
+ else
+ _libname="@WX_LIBRARY_BASENAME_GUI@"
+ fi
+ [ $lib = base ] || _libname="${_libname}_$lib"
+ _libname="${_libname}-@WX_RELEASE@$_target"
+
+ _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
+ done
+
+ echo $_wxlibs
+}
# Sanity check the list of libs the user provided us, if any.
# --------------------------------------------------------------
# We still need the core lib deps for a static build though
if [ "x$this_linkage" = "x-static" ]; then
- wx_libs="$wx_libs ${libdir}/libwx_@TOOLCHAIN_NAME@.a $ldlibs_core @LIBS@"
+ link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a"
+ wx_libs="$wx_libs $link_deps $ldlibs_core @LIBS@"
else
wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@"
fi
match_field "$i" @CORE_BASE_LIBS@ || using_gui=yes
done
+ if [ "x$this_linkage" = "x-static" ]; then
+ link_deps=$(link_deps_for $wx_libs)
+ fi
wx_libs="$_guildflags @WXCONFIG_RPATH@ $(lib_flags_for $wx_libs)"
fi
[ -z "$output_option_cflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@"
[ -z "$output_option_cxxflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@" "@CODE_GEN_FLAGS_CXX@"
[ -z "$output_option_gl_libs" ] || echo $(lib_flags_for gl)
+[ -z "$output_option_linkdeps" ] || echo $link_deps
if [ -n "$output_option_libs" ]; then
projects / wxWidgets.git / blobdiff