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

use Darwin specific double step shared library linking script

Browse Source 
do not add shared library resources to generated executables


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot 2002-05-05 20:03:13 +00:00
parent d5b7a47296
commit 336e99e28d
2 changed files with 328 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

627
configure vendored
View File

File diff suppressed because it is too large Load Diff

17
configure.in
View File

@ -2442,7 +2442,7 @@ if test "$wxUSE_SHARED" = "yes"; then
LDFLAGS_EXE="$LDFLAGS_EXE -Wl,-bind_at_load"
dnl The initialization routine doesn't seem useful with lazy linking solved
dnl SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
SHARED_LD="$CXX -dynamiclib -o"
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -o"
PIC_FLAG="-dynamic -fPIC"
SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
SONAME_FLAGS_GL=${SONAME_FLAGS}
@ -2529,14 +2529,21 @@ fi
if test "$wxUSE_MAC" = 1; then
dnl add the resources target for wxMac
WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
WX_ALL="${WX_ALL} ${LIBWXMACRES}"
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
MACOSX_BUNDLE="bundle"
LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
if test "$wxUSE_SHARED" = "yes"; then
dnl resources are bundled with shared library, not with applications
LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r -o \$(BIN_PROGRAM)"
LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r -o"
else
dnl resources are bundled with applications, not with static library
LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
fi
else
if test "$wxUSE_PM" = 1; then
LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"