[msitools: 3/4] wixl: fix name of gst binaries on win32



commit bfc17b60af4eafc97a68c187a1f22375e53a8c15
Author: Daniel P. Berrangé <berrange redhat com>
Date:   Wed Feb 13 10:19:21 2019 +0000

    wixl: fix name of gst binaries on win32
    
    The binaries have a different name prefix for the win32 vs win64 builds
    so must be conditional based on architecture.
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 data/wixl/gstreamer1-plugins-base.wxi | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/data/wixl/gstreamer1-plugins-base.wxi b/data/wixl/gstreamer1-plugins-base.wxi
index f3c36dc..a39ffa2 100644
--- a/data/wixl/gstreamer1-plugins-base.wxi
+++ b/data/wixl/gstreamer1-plugins-base.wxi
@@ -43,10 +43,18 @@
           <File Id="filD084197A284B069DC169CC8A9FB52E1B" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libgstvideo-1.0-0.dll"/>
         </Component>
         <Component Win64="$(var.Win64)" Id="cmpBBA417A37BD78445680FF8B465BF2973" Guid="*">
-          <File Id="fil5830E2E96130728F825D2CEE3C961889" KeyPath="yes" 
Source="$(var.SourceDir)/bin/x86_64-w64-mingw32-gst-device-monitor-1.0.exe"/>
+          <?if $(var.Win64) = "yes"?>
+            <File Id="fil5830E2E96130728F825D2CEE3C961889" KeyPath="yes" 
Source="$(var.SourceDir)/bin/x86_64-w64-mingw32-gst-device-monitor-1.0.exe"/>
+          <?else?>
+            <File Id="fil5830E2E96130728F825D2CEE3C961889" KeyPath="yes" 
Source="$(var.SourceDir)/bin/i686-w64-mingw32-gst-device-monitor-1.0.exe"/>
+          <?endif?>
         </Component>
         <Component Win64="$(var.Win64)" Id="cmpDDBB0DA81122B9A9ED43F16BD05A9EA8" Guid="*">
-          <File Id="fil19157EDBA14F9D94E025AF5BB75D2645" KeyPath="yes" 
Source="$(var.SourceDir)/bin/x86_64-w64-mingw32-gst-play-1.0.exe"/>
+          <?if $(var.Win64) = "yes"?>
+            <File Id="fil19157EDBA14F9D94E025AF5BB75D2645" KeyPath="yes" 
Source="$(var.SourceDir)/bin/x86_64-w64-mingw32-gst-play-1.0.exe"/>
+          <?else?>
+            <File Id="fil19157EDBA14F9D94E025AF5BB75D2645" KeyPath="yes" 
Source="$(var.SourceDir)/bin/i686-w64-mingw32-gst-play-1.0.exe"/>
+          <?endif?>
         </Component>
       </Directory>
       <Directory Id="dir8F8E08157F02A6A8C67E14F692417771" Name="lib">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]