| Message ID | 20190129113921.21599-4-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | misc fixes to deal with icon location changes | expand |
On 29.01.19 12:39, Daniel P. Berrangé wrote: > 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é <berrange@redhat.com> > --- > 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 > Technically this is fine, therefore Signed-off-by: Stefan Weil <sw@weilnetz.de> But I wonder whether a Windows installer without bundled DLLs makes sense. If it doesn't, we could as well fail if the DLL path is empty. Regards Stefan
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
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é <berrange@redhat.com> --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)