Remove last vestiges of Carbon-related tools from the makefile
Don't detect DeRez, Rez and SetFile in configure, they are not used any longer as .r resource files are not used under modern macOS.
This commit is contained in:
34
configure.in
34
configure.in
@@ -7977,31 +7977,6 @@ if test "$wxUSE_MSW" = 1 ; then
|
||||
RESCOMP="$WINDRES"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
dnl base name of the resource file for wxMac must be the same
|
||||
dnl as library installation base name (-install_name)
|
||||
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
|
||||
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
|
||||
|
||||
dnl add the resources target for wxMac
|
||||
LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
|
||||
|
||||
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
|
||||
|
||||
MACSETFILE="\$(SETFILE)"
|
||||
|
||||
dnl resources are bundled both with shared library and applications
|
||||
dnl since the carb resource *must* be included in the application
|
||||
POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
|
||||
RESCOMP="cat /dev/null \| $REZ"
|
||||
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
|
||||
|
||||
else
|
||||
dnl default value is to (silently) do nothing in the makefile
|
||||
MACSETFILE="@true"
|
||||
POSTLINK_COMMAND="@true"
|
||||
fi
|
||||
|
||||
fi
|
||||
dnl wxUSE_GUI = 1
|
||||
|
||||
@@ -8155,15 +8130,6 @@ AC_SUBST(WX_VERSION_TAG)
|
||||
dnl additional resurces settings
|
||||
AC_SUBST(RESCOMP)
|
||||
AC_SUBST(WINDRES)
|
||||
AC_SUBST(REZ)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_DATA)
|
||||
|
||||
dnl additional for Mac OS X
|
||||
AC_SUBST(DEREZ)
|
||||
AC_SUBST(LIBWXMACRES)
|
||||
AC_SUBST(POSTLINK_COMMAND)
|
||||
AC_SUBST(MACSETFILE)
|
||||
|
||||
dnl other tools
|
||||
AC_SUBST(GCC)
|
||||
|
Reference in New Issue
Block a user