From 6fad166b4463ddf4dd98330bd8a0286932680a84 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Sat, 7 May 2016 19:29:48 +0200
Subject: [PATCH] Package MSFS simulator plugins only if they exist

There are no 64 bit MSFS simulator plugins available. Therefore don't
package them, if they were not built.

refs #615
---
 installer/installbuilder/swift-externals.xml         | 3 ++-
 installer/installbuilder/swift-plugin-simulators.xml | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
index 9dd5aa5fa..3675bb569 100644
--- a/installer/installbuilder/swift-externals.xml
+++ b/installer/installbuilder/swift-externals.xml
@@ -25,7 +25,8 @@
                     <origin>../../dist/bin/*portaudio*.dll</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/SimConnect.dll</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/SimConnect*</origin>
                 </distributionFile>
                 <distributionFile>
                     <origin>../../dist/bin/speexdsp.dll</origin>
diff --git a/installer/installbuilder/swift-plugin-simulators.xml b/installer/installbuilder/swift-plugin-simulators.xml
index 4a2c92b4a..8e3b7f489 100644
--- a/installer/installbuilder/swift-plugin-simulators.xml
+++ b/installer/installbuilder/swift-plugin-simulators.xml
@@ -29,6 +29,9 @@
                 <platformTest>
                     <type>windows</type>
                 </platformTest>
+                <fileExists>
+                    <path>${build_project_directory}/../../dist/bin/plugins/simulator/simulatorfs9.dll</path>
+                </fileExists>
             </shouldPackRuleList>
         </component>
         <component>
@@ -59,6 +62,9 @@ This plugin acts as the interface between swift and FSX.</detailedDescription>
                 <platformTest>
                     <type>windows</type>
                 </platformTest>
+                <fileExists>
+                    <path>${build_project_directory}/../../dist/bin/plugins/simulator/simulatorfsx.dll</path>
+                </fileExists>
             </shouldPackRuleList>
         </component>
         <component>