Commit 612e1b38 authored by Nguyễn Thái Ngọc Duy's avatar Nguyễn Thái Ngọc Duy Committed by Ralf Habacker

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)
parent 4c02c626
...@@ -89,6 +89,10 @@ if test "$dbus_win" = yes; then ...@@ -89,6 +89,10 @@ if test "$dbus_win" = yes; then
*-rc*) BUILD_FILEVERSION="${BUILD_FILEVERSION}1" ;; *-rc*) BUILD_FILEVERSION="${BUILD_FILEVERSION}1" ;;
*) BUILD_FILEVERSION="${BUILD_FILEVERSION}2" ;; *) BUILD_FILEVERSION="${BUILD_FILEVERSION}2" ;;
esac 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 else
AC_DEFINE(DBUS_UNIX,1,[Defined if we run on a Unix-based system]) AC_DEFINE(DBUS_UNIX,1,[Defined if we run on a Unix-based system])
fi fi
......
...@@ -15,14 +15,10 @@ lib_LTLIBRARIES=libdbus-1.la ...@@ -15,14 +15,10 @@ lib_LTLIBRARIES=libdbus-1.la
# Deal with W32 .def and version-info.rc stuff # Deal with W32 .def and version-info.rc stuff
# #
if DBUS_WIN 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 SUFFIXES = rc
.rc.o: .rc.o:
$(LTRCCOMPILE) -i $< -o $@ $(WINDRES) $< -o $@
dbus_res = versioninfo.o dbus_res = versioninfo.o
dbus_res_ldflag = -Wl,$(dbus_res) dbus_res_ldflag = -Wl,$(dbus_res)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment