AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changes to wx-config --static to allow static linkage in presence of shared library

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2001-11-22 00:32:53 +00:00
parent affe40440e
commit 885d4bf54e
3 changed files with 323 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

609
configure vendored
View File

File diff suppressed because it is too large Load Diff

10
configure.in
View File

@ -2443,9 +2443,11 @@ WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
dnl define which libs wx-config should link.
WXCONFIG_LIBS="-l${WX_LIBRARY}"
WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
if test "$wxUSE_OPENGL" = "yes"; then
WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
fi
@ -2592,6 +2594,7 @@ if test "$wxUSE_SHARED" = "yes"; then
dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
WX_TARGET_LIBRARY_TYPE="so"
INSTALL_LIBRARY='$(INSTALL_PROGRAM)'
fi
dnl do not 'else' this, it may be changed in the above conditional.
@ -2618,6 +2621,7 @@ if test "$wxUSE_SHARED" = "no"; then
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
WX_TARGET_LIBRARY_TYPE="a"
INSTALL_LIBRARY='$(INSTALL_DATA)'
fi
if test "$wxUSE_MAC" = 1; then
@ -4783,6 +4787,8 @@ AC_SUBST(host_alias)
AC_SUBST(cross_compiling)
AC_SUBST(WXCONFIG_LIBS)
AC_SUBST(WXCONFIG_LIBS_GL)
AC_SUBST(WXCONFIG_LIBS_STATIC)
AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
AC_SUBST(WXCONFIG_INCLUDE)
dnl what to compile
@ -4822,6 +4828,8 @@ AC_SUBST(AS)
AC_SUBST(NM)
AC_SUBST(LD)
AC_SUBST(MAKEINFO)
AC_SUBST(INSTALL_LIBRARY)
dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE

9
wx-config.in
View File

@ -100,14 +100,19 @@ while test $# -gt 0; do
fi
if test $static_flag = yes ; then
echo "$libs @LDFLAGS@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@"
echo "$libs @LDFLAGS@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
else
echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
fi
;;
--gl-libs)
echo @LDFLAGS_GL@ @WXCONFIG_LIBS_GL@
if test $static_flag = yes -a "x" != "x@WXCONFIG_LIBS_STATIC_GL@" ; then
gllibs="@libdir@/@WXCONFIG_LIBS_STATIC_GL@"
else
gllibs="@WXCONFIG_LIBS_GL@"
fi
echo @LDFLAGS_GL@ "$gllibs"
;;
--cc)
echo $CC