Fix popen2 deprecation warning.
Fix binary name inside the framework to be the same as the framework name. Inject a bit of info about the framework into wx-config, so it can output framework flags/names instead of lib flags/names. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
783d8c1131
commit
b4f28d1ef6
2 changed files with 40 additions and 9 deletions
12
wx-config.in
12
wx-config.in
|
|
@ -245,6 +245,9 @@ check_yesno_option()
|
|||
}
|
||||
|
||||
|
||||
MAC_FRAMEWORK=
|
||||
MAC_FRAMEWORK_PREFIX=
|
||||
|
||||
|
||||
# Now we are ready to find out what the user wants from us.
|
||||
# --------------------------------------------------------------
|
||||
|
|
@ -1263,6 +1266,15 @@ if [ -n "$output_option_libs" ]; then
|
|||
[ "x$libdir" = "x/usr/lib" ] ||
|
||||
_ldflags="-L$libdir"
|
||||
|
||||
if [ -n "$MAC_FRAMEWORK" ]; then
|
||||
wx_libs="-framework $MAC_FRAMEWORK"
|
||||
if [ -n "$MAC_FRAMEWORK_PREFIX" ]; then
|
||||
_ldflags="-F$MAC_FRAMEWORK_PREFIX"
|
||||
else
|
||||
_ldflags=""
|
||||
fi
|
||||
fi
|
||||
|
||||
is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
|
||||
|
||||
echo $_ldflags "@WXCONFIG_LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue