SourceForge patch #654210 to fix naming/numbering shared libs under OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
15
configure.in
15
configure.in
@@ -2767,6 +2767,17 @@ case "${host}" in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-darwin* )
|
*-*-darwin* )
|
||||||
|
dnl Under Mac OS X, the naming conventions for shared libraries
|
||||||
|
dnl are different: the number precedes the suffix.
|
||||||
|
|
||||||
|
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
|
||||||
|
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
|
||||||
|
|
||||||
|
WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
|
||||||
|
WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
|
||||||
|
WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
|
||||||
|
WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
|
||||||
|
|
||||||
dnl Under Mac OS X, we should build real frameworks instead of simple
|
dnl Under Mac OS X, we should build real frameworks instead of simple
|
||||||
dnl dynamic shared libraries (in order to embed the resources)
|
dnl dynamic shared libraries (in order to embed the resources)
|
||||||
if test "$wxUSE_MAC" = 1; then
|
if test "$wxUSE_MAC" = 1; then
|
||||||
@@ -2903,8 +2914,8 @@ if test "$wxUSE_SHARED" = "yes"; then
|
|||||||
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
|
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
|
||||||
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
|
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
|
||||||
PIC_FLAG="-dynamic -fPIC"
|
PIC_FLAG="-dynamic -fPIC"
|
||||||
SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
|
SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
|
||||||
SONAME_FLAGS_GL=${SONAME_FLAGS}
|
SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-aix* )
|
*-*-aix* )
|
||||||
|
@@ -21,7 +21,7 @@ while test $# -gt 0; do
|
|||||||
verbose=1
|
verbose=1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-o|-compatibility_version|-current_version|-framework|-undefined)
|
-o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
|
||||||
# collect these options and values
|
# collect these options and values
|
||||||
args="$args $1 $2"
|
args="$args $1 $2"
|
||||||
shift
|
shift
|
||||||
|
Reference in New Issue
Block a user