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

Really fix using install_name_tool with wxrc under OS X.

Browse Source 
Don't test for USE_XRC before it is set, correcting the wrong change of
r75845.

See #15946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-02 15:49:58 +00:00
parent 1e879aa8b6
commit a73ce1c90e
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -29188,10 +29188,6 @@ for i in \${libnames} ; do
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
done done
EOF EOF
if test $USE_XRC = 1; then
echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
fi
chmod +x change-install-names chmod +x change-install-names
DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
fi fi
@@ -36546,6 +36542,8 @@ $as_echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;}
USE_XRC=1 USE_XRC=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
fi fi
fi fi

6
configure.in
View File

@@ -3784,10 +3784,6 @@ for i in \${libnames} ; do
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
done done
EOF EOF
if test $USE_XRC = 1; then
echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
fi
chmod +x change-install-names chmod +x change-install-names
DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
fi fi
@@ -7150,6 +7146,8 @@ if test "$wxUSE_XRC" = "yes"; then
AC_DEFINE(wxUSE_XRC) AC_DEFINE(wxUSE_XRC)
USE_XRC=1 USE_XRC=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
fi fi
fi fi