summaryrefslogtreecommitdiffstats
path: root/qga
diff options
context:
space:
mode:
authorMarc-André Lureau2022-05-25 16:41:38 +0200
committerMarc-André Lureau2022-05-28 11:42:56 +0200
commit0480a1b67b22218637ab299fb0ea7df2ff8287ce (patch)
treeddef325475cb6a3833813589d5f8b66f6bf93bb1 /qga
parentqga/wixl: require Mingw_bin (diff)
downloadqemu-0480a1b67b22218637ab299fb0ea7df2ff8287ce.tar.gz
qemu-0480a1b67b22218637ab299fb0ea7df2ff8287ce.tar.xz
qemu-0480a1b67b22218637ab299fb0ea7df2ff8287ce.zip
qga/wixl: simplify some pre-processing
Sadly, wixl doesn't have 'elif'. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> Message-Id: <20220525144140.591926-14-marcandre.lureau@redhat.com>
Diffstat (limited to 'qga')
-rw-r--r--qga/installer/qemu-ga.wxs20
1 files changed, 7 insertions, 13 deletions
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index 651db6e51c..e5b0958e18 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -1,21 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?ifndef var.Arch?>
- <?error Define Arch to 32 or 64?>
- <?endif?>
-
<?if $(var.Arch) = "64"?>
<?define ArchLib=libgcc_s_seh-1.dll?>
<?define GaProgramFilesFolder="ProgramFiles64Folder" ?>
- <?endif?>
-
- <?if $(var.Arch) = "32"?>
- <?define ArchLib=libgcc_s_dw2-1.dll?>
- <?define GaProgramFilesFolder="ProgramFilesFolder" ?>
- <?endif?>
-
- <?ifndef var.ArchLib ?>
- <?error Unexpected Arch value $(var.Arch)?>
+ <?else?>
+ <?if $(var.Arch) = "32"?>
+ <?define ArchLib=libgcc_s_dw2-1.dll?>
+ <?define GaProgramFilesFolder="ProgramFilesFolder" ?>
+ <?else?>
+ <?error Unexpected Arch value $(var.Arch)?>
+ <?endif?>
<?endif?>
<Product