Fix wx-config --libs
in monolithic build.
Don't include non-existent libraries (which are built as part of the main monolithic one) in this case. Closes #15567. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
12
wx-config.in
12
wx-config.in
@@ -1203,12 +1203,14 @@ if is_monolithic; then
|
||||
|
||||
# Only add additional info if --libs was specified and not just --optional-libs
|
||||
if [ -n "$output_option_libs" ]; then
|
||||
# Core libs are already built into the blob.
|
||||
for i in std @STD_GUI_LIBS@ @STD_BASE_LIBS@; do
|
||||
wx_libs=`remove_field $i $wx_libs`
|
||||
done
|
||||
# The only library we need to add when using monolithic build is the gl
|
||||
# one as all the others are already included into the main one.
|
||||
if match_field gl $wx_libs; then
|
||||
wx_libs=gl
|
||||
else
|
||||
wx_libs=
|
||||
fi
|
||||
|
||||
wx_libs=`order_libs $wx_libs`
|
||||
wx_libs="@WXCONFIG_LDFLAGS_GUI@ `lib_flags_for $wx_libs`"
|
||||
|
||||
# We still need the core lib deps for a static build though
|
||||
|
Reference in New Issue
Block a user