Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move wxAdv library contents into wxCore

Browse Source 
This basically removes the "adv" library, even though it's still
preserved for compatibility with user make/project files referring to
it.

It is done because the distinction between "adv" and "core" was never
really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in
adv?) and it prevented some core classes from using adv ones.
This commit is contained in:
Vadim Zeitlin
2018-08-27 16:34:34 +02:00
parent b38813a5e9
commit 3ffa651a34
314 changed files with 9761 additions and 11422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wx-config.in
View File

@@ -1026,11 +1026,10 @@ fi
ldflags_gl="@LDFLAGS_GL@"
ldlibs_base="@WXCONFIG_LIBS@"
ldlibs_core="@EXTRALIBS_GUI@"
ldlibs_core="@EXTRALIBS_GUI@ @EXTRALIBS_SDL@"
ldlibs_gl="@OPENGL_LIBS@"
ldlibs_html="@EXTRALIBS_HTML@"
ldlibs_xml="@EXTRALIBS_XML@"
ldlibs_adv="@EXTRALIBS_SDL@"
ldlibs_stc="@EXTRALIBS_STC@"
ldlibs_webview="@EXTRALIBS_WEBVIEW@"
@@ -1050,15 +1049,14 @@ order_libs()
# those that can be output immediately because no other libraries
# depend on them.
case "$lib" in
base|core|html|xml|adv) eval "use_$lib=1" ;;
*) libs="$libs $lib" ;;
base|core|html|xml) eval "use_$lib=1" ;;
*) libs="$libs $lib" ;;
esac
done
# Add the libraries that we postponed adding above.
# Order of the checks here is important.
[ -z "$use_html" ] || libs="$libs html"
[ -z "$use_adv" ] || libs="$libs adv"
[ -z "$use_core" ] || libs="$libs core"
[ -z "$use_xml" ] || libs="$libs xml"
[ -z "$use_base" ] || libs="$libs base"