mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-05 13:28:02 +02:00
use WINDRES instead of RC to compile rc file
This is the way used by GTK+ and other packages. I don't know much about "RC" though. (cherry picked from commit d5b993ebc1411b15e4563d05fbd92cf8b29cbb4c)
This commit is contained in:
parent
4c02c62621
commit
612e1b38f4
2 changed files with 5 additions and 5 deletions
|
|
@ -89,6 +89,10 @@ if test "$dbus_win" = yes; then
|
|||
*-rc*) BUILD_FILEVERSION="${BUILD_FILEVERSION}1" ;;
|
||||
*) BUILD_FILEVERSION="${BUILD_FILEVERSION}2" ;;
|
||||
esac
|
||||
AC_CHECK_TOOL(WINDRES, windres, no)
|
||||
if test "$WINDRES" = no; then
|
||||
AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
|
||||
fi
|
||||
else
|
||||
AC_DEFINE(DBUS_UNIX,1,[Defined if we run on a Unix-based system])
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -15,14 +15,10 @@ lib_LTLIBRARIES=libdbus-1.la
|
|||
# Deal with W32 .def and version-info.rc stuff
|
||||
#
|
||||
if DBUS_WIN
|
||||
LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
|
||||
`echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
|
||||
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
|
||||
|
||||
SUFFIXES = rc
|
||||
|
||||
.rc.o:
|
||||
$(LTRCCOMPILE) -i $< -o $@
|
||||
$(WINDRES) $< -o $@
|
||||
|
||||
dbus_res = versioninfo.o
|
||||
dbus_res_ldflag = -Wl,$(dbus_res)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue