From d8c156a7621b3f601271f402623e0accce28a1c2 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Wed, 29 Nov 2017 15:28:10 +0100
Subject: [PATCH] Fix building a bitrock installer with MinGW binaries

Summary:
This simply fixes the errors, one will see if an installer is created after
a MinGW build. This does not change the fact that a MinGW installer is
not supported and not necessary. The installed software will not be able
to run due to missing dependencies. But the installer can be created and
executed for testing.

Reviewers: #swift_pilot_client, kbasan

Reviewed By: #swift_pilot_client, kbasan

Subscribers: jenkins

Differential Revision: https://dev.swift-project.org/D67
---
 installer/installbuilder/swift-externals.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
index 8a2e4233c..f70195276 100644
--- a/installer/installbuilder/swift-externals.xml
+++ b/installer/installbuilder/swift-externals.xml
@@ -18,7 +18,8 @@
             <platforms>windows</platforms>
             <distributionFileList>
                 <distributionFile>
-                    <origin>../../dist/bin/vatlib.dll</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/*vatlib*.dll</origin>
                 </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
@@ -26,17 +27,19 @@
                 </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
-                    <origin>../../dist/bin/SimConnect*</origin>
+                    <origin>../../dist/bin/SimConnect*.dll</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/speexdsp.dll</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/*speexdsp*.dll</origin>
                 </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/*opus*.dll</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/swift_crashpad_handler.exe</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/*swift_crashpad_handler.exe</origin>
                 </distributionFile>
             </distributionFileList>
         </folder>