AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't output -DwxUSE_GUI=0 in cflags by default, do output it if 'base' is specified after cflags option (patch from John Labenski)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-07-11 21:54:51 +00:00
parent b7ed9e10d3
commit 6bddfdbf19
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wx-config.in
View File

@ -46,14 +46,14 @@ usage()
wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
[--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
[--universal[=yes|no]] [--unicode[=yes|no]] [--debug[=yes|no]]
[--static[=yes|no]] [--version[=VERSION]] [--basename] [--cc]
[--cppflags] [--cflags] [--cxxflags] [--rescomp] [--cxx]
[--linkdeps] [--ld] [--utility=UTIL]
[--static[=yes|no]] [--version[=VERSION]] [--basename]
[--cc] [--cxx] [--cppflags [base]] [--cxxflags [base]] [--cflags]
[--rescomp] [--linkdeps] [--ld] [--utility=UTIL]
[--libs [LIBS...]] [--optional-libs [LIBS...]]
wx-config returns information about the wxWidgets libraries available on
your system. It may be used to retrieve the information required to build
applications using these libraries using --cppflags, --cflags, --cxxflags
applications using these libraries using --cppflags, --cxxflags, --cflags,
and --libs options.
If multiple builds of wxWidgets are available, you can use the options
@ -276,11 +276,12 @@ for arg do
*)
# We validate the parameters later ...
if [ "$_name" = "libs" ]
then
if [ "$_name" = "cxxflags" ] || [ "$_name" = "cppflags" ]; then
cxx_parameters="${cxx_parameters:+$cxx_parameters }$arg"
elif [ "$_name" = "libs" ]; then
libs_parameters="${libs_parameters:+$libs_parameters }$arg"
elif [ "$_name" = "optional_libs" ]
then
elif [ "$_name" = "optional_libs" ]; then
optional_libs_parameters="${optional_libs_parameters:+$optional_libs_parameters }$arg"
else
# These are unattached args and signify an error
@ -1101,6 +1102,9 @@ done
[ -z "$WXDEBUG" ] || decho " user supplied libs: '$wx_libs'"
# Assume we are using the GUI, unless --libs was specified with no GUI libs
using_gui=yes
if is_monolithic; then
# Only add additional info if --libs was specified and not just --optional-libs
@ -1119,8 +1123,6 @@ if is_monolithic; then
else
wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@"
fi
using_gui=yes
fi
else # MONOLITHIC = 0
@ -1143,6 +1145,7 @@ else # MONOLITHIC = 0
fi
fi
if [ -n "$output_option_libs" ]; then
using_gui=no
for i in $wx_libs ; do
if match_field "$i" @STD_GUI_LIBS@; then
@ -1152,6 +1155,7 @@ else # MONOLITHIC = 0
fi
match_field "$i" @STD_BASE_LIBS@ || using_gui=yes
done
fi
if is_static; then
link_deps=`link_deps_for $wx_libs`
@ -1160,6 +1164,12 @@ else # MONOLITHIC = 0
fi
# If they explicitly set "--cxx(pp)flags base" then they don't want the GUI
if [ "$cxx_parameters" = "base" ]; then
using_gui=no
fi
if [ -n "$WXDEBUG" ]; then
decho
decho " using libs: '$wx_libs'"