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

Fix linking of wxscintilla in static monolithic build

Browse source 
wx-config didn't report -lwxscintilla for `wx-config --libs stc` in static
monolithic build.

Since stc is a part of monolithic lib, -lwxscintilla will be reported
for `wx-config --libs` now as well.
This commit is contained in:
Pavel O 2017-12-06 01:02:47 +03:00 • committed by VZ
parent f75387850b
commit 204bc3c887
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configure vendored
View file

@ -35905,6 +35905,9 @@ WXCONFIG_LIBS="$LIBS"
if test "$wxUSE_REGEX" = "builtin" ; then if test "$wxUSE_REGEX" = "builtin" ; then
wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty" wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty"
fi fi
if test "$wxUSE_STC" = "yes" ; then
wxconfig_3rdparty="scintilla $wxconfig_3rdparty"
fi
case "$wxUSE_EXPAT" in case "$wxUSE_EXPAT" in
builtin) builtin)
wxconfig_3rdparty="expat $wxconfig_3rdparty" wxconfig_3rdparty="expat $wxconfig_3rdparty"

3
configure.in
View file

@ -7831,6 +7831,9 @@ dnl wx-config must output 3rd party libs in --libs in static build:
if test "$wxUSE_REGEX" = "builtin" ; then if test "$wxUSE_REGEX" = "builtin" ; then
wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty" wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty"
fi fi
if test "$wxUSE_STC" = "yes" ; then
wxconfig_3rdparty="scintilla $wxconfig_3rdparty"
fi
case "$wxUSE_EXPAT" in case "$wxUSE_EXPAT" in
builtin) builtin)
wxconfig_3rdparty="expat $wxconfig_3rdparty" wxconfig_3rdparty="expat $wxconfig_3rdparty"