From 80054fcafb095aff76f6df00d348c7fd85e8ddbc Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sat, 30 Mar 2013 19:44:14 +0000 Subject: [PATCH] hw/xwin: Update manifest to target all architectures, not just x86 Update manifest to target all architectures, not just x86 Also: Write explicit dependencies for Xwin.rc. XWin.exe.manifest and X.ico are included the resource compiler output, so add a dependency on them to cause it to be recompiled if they change. Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/Makefile.am | 2 ++ hw/xwin/XWin.exe.manifest | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 93ce57038..f13197592 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -160,6 +160,8 @@ XWin_LDFLAGS = -mwindows -static .rc.o: $(AM_V_GEN)$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include +XWin.o: XWin.rc XWin.exe.manifest X.ico + winprefsyacc.h: winprefsyacc.c winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h diff --git a/hw/xwin/XWin.exe.manifest b/hw/xwin/XWin.exe.manifest index a0d4d7dae..477334fb3 100755 --- a/hw/xwin/XWin.exe.manifest +++ b/hw/xwin/XWin.exe.manifest @@ -7,7 +7,7 @@ type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" - processorArchitecture="X86" + processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />