From 0b516ef0dfad9a7b34c675c98e8ec92ab4d38466 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 8 Aug 2013 20:18:07 +0200 Subject: [PATCH] w32: Add missing version.o to all executables (fix regression) QEMU executables for w32, w64 had included meta information built from version.rc. These rules were changed several times some months ago. The latest version added version.o to the tools, but not to the system emulations. This patch adds the meta information to all system emulations again. Signed-off-by: Stefan Weil Message-id: 1375985887-3984-1-git-send-email-sw@weilnetz.de Signed-off-by: Anthony Liguori --- Makefile | 7 ++----- Makefile.objs | 5 +++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 29f10436f8..4d257f1a52 100644 --- a/Makefile +++ b/Makefile @@ -167,11 +167,8 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) -version.o: $(SRC_PATH)/version.rc config-host.h | version.lo -version.lo: $(SRC_PATH)/version.rc config-host.h - -version-obj-$(CONFIG_WIN32) += version.o -version-lobj-$(CONFIG_WIN32) += version.lo +$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo +$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h Makefile: $(version-obj-y) $(version-lobj-y) diff --git a/Makefile.objs b/Makefile.objs index 9928542cdf..f46a4cdd6a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -98,6 +98,11 @@ common-obj-y += hw/ common-obj-y += qom/ common-obj-y += disas/ +###################################################################### +# Resource file for Windows executables +version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o +version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo + ###################################################################### # guest agent