From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ueoar-0003VR-MR for qemu-devel@nongnu.org; Tue, 21 May 2013 11:35:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ueoal-00033x-49 for qemu-devel@nongnu.org; Tue, 21 May 2013 11:35:17 -0400 Received: from usindpps06.hds.com ([207.126.252.19]:52752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ueoak-00033t-Vx for qemu-devel@nongnu.org; Tue, 21 May 2013 11:35:11 -0400 From: Tomoki Sekiyama Date: Tue, 21 May 2013 11:34:08 -0400 Message-ID: <20130521153408.4880.99760.stgit@hds.com> In-Reply-To: <20130521153333.4880.74390.stgit@hds.com> References: <20130521153333.4880.74390.stgit@hds.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC PATCH v3 09/11] qemu-ga: Add VSS provider .tlb file in the repository List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, vrozenfe@redhat.com, pbonzini@redhat.com, seiji.aguchi@hds.com, areis@redhat.com To build type library (.tlb) for qga-provider.dll from COM IDL (.idl), MIDL in VisualC++ and stdole2.tlb in Windows SDK are required. This patch adds pre-compiled .tlb file in the repository in order to enable cross-compile qemu-ga.exe for Windows with VSS support. Signed-off-by: Tomoki Sekiyama --- Makefile | 2 +- qga/vss-win32-provider/Makefile.objs | 4 ++++ qga/vss-win32-provider/qga-provider.tlb | Bin 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 qga/vss-win32-provider/qga-provider.tlb diff --git a/Makefile b/Makefile index b87cc5a..1652d3d 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,7 @@ clean: rm -f qemu-options.def find . -name '*.[oda]' -type f -exec rm -f {} + find . -name '*.l[oa]' -type f -exec rm -f {} + - rm -f $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ + rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ rm -Rf .libs rm -f qemu-img-cmds.h @# May not be present in GENERATED_HEADERS diff --git a/qga/vss-win32-provider/Makefile.objs b/qga/vss-win32-provider/Makefile.objs index 73ef752..698359b 100644 --- a/qga/vss-win32-provider/Makefile.objs +++ b/qga/vss-win32-provider/Makefile.objs @@ -18,4 +18,8 @@ MIDL=midl WINSDK="C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Include" $(obj)/qga-provider.tlb: $(SRC_PATH)/$(obj)/qga-provider.idl +ifeq ($(wildcard $(SRC_PATH)/$(obj)/qga-provider.tlb),) $(call quiet-command,$(MIDL) -m64 -o $@ -I $(WINSDK) $<," MIDL $(TARGET_DIR)$@") +else + $(call quiet-command,cp $(dir $<)qga-provider.tlb $@, " COPY $(TARGET_DIR)$@") +endif diff --git a/qga/vss-win32-provider/qga-provider.tlb b/qga/vss-win32-provider/qga-provider.tlb new file mode 100644 index 0000000000000000000000000000000000000000..226452a1861371ffe0cad1019cf90fdfdcd5ef49 GIT binary patch literal 1528 zcmeYbb_-!*U}OLRP8Kl5;0UB3A_y8H!@$4OPh6a(1_GM|T)fx!kz-UGh_rLWKC!yoBjb#vz`9Lwu4+R-SJ!kIOX4xLBUUGN9-NyTyP76j}@n z2f!qQ8-xepfXD+7rW+{SKz4&@7#qX~^1#sn3O|tFK>%ciE<&_Q3PuKoMqI)S5zj9Ngog_= gXfrXehlhjmFbIJB4$8MKU>*YlD1Z9^F{m5{03Vre%>V!Z literal 0 HcmV?d00001