Separate RESCOMP into WINDRES (for Win32) and REZ (for Mac OS).
Don't check for windres as bakefile.m4 now does it properly. Rename MACRESCOMP to POSTLINK_COMMAND. Rename MACRESWXCONFIG to WXCONFIG_POSTLINK_COMMAND. Use newest bakefile.m4 (with similar changes). Add --rezflags option back to wx-config so existing user Makefiles don't break. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9cd03a43ce
commit
891ace0538
4 changed files with 23 additions and 26 deletions
|
|
@ -611,26 +611,20 @@ dnl ---------------------------------------------------------------------------
|
|||
|
||||
AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
|
||||
[
|
||||
RESCOMP=
|
||||
SETFILE=
|
||||
|
||||
case ${BAKEFILE_HOST} in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
dnl Check for win32 resources compiler:
|
||||
if test "$build" != "$host" ; then
|
||||
RESCOMP=$host_alias-windres
|
||||
else
|
||||
AC_CHECK_PROG(RESCOMP, windres, windres, windres)
|
||||
fi
|
||||
AC_CHECK_TOOL(WINDRES, windres)
|
||||
;;
|
||||
|
||||
*-*-darwin* | powerpc-apple-macos* )
|
||||
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
|
||||
AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
|
||||
AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(RESCOMP)
|
||||
AC_SUBST(WINDRES)
|
||||
AC_SUBST(REZ)
|
||||
AC_SUBST(SETFILE)
|
||||
])
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue