solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Only include Scintilla libraries in wx-config --libs if needed

Browse source 
Don't always output -lscintilla and -llexilla in wx-config --libs, as
they are not needed unless linking with wxstc library is requested but
204bc3c887 (Fix linking of wxscintilla in static monolithic build,
2017-12-06) added them unconditionally.

Improve this by putting them in a separate WXCONFIG_STC_LIBS instead of
WXCONFIG_LIBS used for all libraries (even wxbase, which is wrong on its
own).

Also see #23643.
This commit is contained in:
Vadim Zeitlin 2023-07-23 02:35:53 +02:00
parent 97546a6f0c
commit 57c71a4547
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
wx-config.in
View file

@ -1033,7 +1033,7 @@ ldlibs_gl="@OPENGL_LIBS@"
ldlibs_html="@EXTRALIBS_HTML@"
ldlibs_media="@EXTRALIBS_MEDIA@"
ldlibs_xml="@EXTRALIBS_XML@"
ldlibs_stc="@EXTRALIBS_STC@"
ldlibs_stc="@WXCONFIG_STC_LIBS@ @EXTRALIBS_STC@"
ldlibs_webview="@EXTRALIBS_WEBVIEW@"