[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] nsis: ensure we always pass -W64 flag to nsis i
|
From: |
Daniel P . Berrangé |
|
Subject: |
[Qemu-devel] [PATCH 3/5] nsis: ensure we always pass -W64 flag to nsis installer script |
|
Date: |
Tue, 29 Jan 2019 11:39:19 +0000 |
The code to set the -W64 flag is inside a conditional block that only
executes when we are bundling DLLs with the installer. This results in
QEMU being installed in the wrong location on 64-bit hosts when DLLs
are not bundled.
Signed-off-by: Daniel P. Berrangé <address@hidden>
---
Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 14a463564e..97a6727358 100644
--- a/Makefile
+++ b/Makefile
@@ -893,11 +893,14 @@ INSTALLER = qemu-setup-$(VERSION)$(EXESUF)
nsisflags = -V2 -NOCD
+ifeq ($(ARCH),x86_64)
+nsisflags += -DW64
+endif
+
ifneq ($(wildcard $(SRC_PATH)/dll),)
ifeq ($(ARCH),x86_64)
# 64 bit executables
DLL_PATH = $(SRC_PATH)/dll/w64
-nsisflags += -DW64
else
# 32 bit executables
DLL_PATH = $(SRC_PATH)/dll/w32
--
2.20.1