Changes for installer

mumble-voip · Oct 29, 2016 · c107b39 · c107b39
1 parent ba69d8c
commit c107b39
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/installer/Plugins.wxs b/installer/Plugins.wxs
@@ -14,9 +14,6 @@
       <Component Id="arma2.dll">
         <File Source="$(var.SourceDir)\release\plugins\arma2.dll" KeyPath="yes" />
       </Component>
-      <Component Id="bf1.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bf1.dll" KeyPath="yes" />
-      </Component>
       <Component Id="bf1942.dll">
         <File Source="$(var.SourceDir)\release\plugins\bf1942.dll" KeyPath="yes" />
       </Component>
@@ -35,9 +32,6 @@
       <Component Id="bfheroes.dll">
         <File Source="$(var.SourceDir)\release\plugins\bfheroes.dll" KeyPath="yes" />
       </Component>
-      <Component Id="bf4.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bf4.dll" KeyPath="yes" />
-      </Component>
       <Component Id="bf4_x86.dll">
         <File Source="$(var.SourceDir)\release\plugins\bf4_x86.dll" KeyPath="yes" />
       </Component>
@@ -89,9 +83,6 @@
       <Component Id="gtaiv.dll">
         <File Source="$(var.SourceDir)\release\plugins\gtaiv.dll" KeyPath="yes" />
       </Component>
-      <Component Id="gtav.dll">
-        <File Source="$(var.SourceDir)\release\plugins\gtav.dll" KeyPath="yes" />
-      </Component>
       <Component Id="gw.dll">
         <File Source="$(var.SourceDir)\release\plugins\gw.dll" KeyPath="yes" />
       </Component>
@@ -146,23 +137,18 @@
       <Component Id="wow.dll">
         <File Source="$(var.SourceDir)\release\plugins\wow.dll" KeyPath="yes" />
       </Component>
-      <Component Id="wow_x64.dll">
-        <File Source="$(var.SourceDir)\release\plugins\wow_x64.dll" KeyPath="yes" />
-      </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="Plugins">
       <ComponentRef Id="link.dll" />
       <ComponentRef Id="aoc.dll" />
       <ComponentRef Id="arma2.dll" />
-      <ComponentRef Id="bf1.dll" />
       <ComponentRef Id="bf1942.dll" />
       <ComponentRef Id="bf2.dll" />
       <ComponentRef Id="bf2142.dll" />
       <ComponentRef Id="bf3.dll" />
       <ComponentRef Id="bfbc2.dll" />
       <ComponentRef Id="bfheroes.dll" />
-      <ComponentRef Id="bf4.dll" />
       <ComponentRef Id="bf4_x86.dll" />
       <ComponentRef Id="borderlands.dll" />
       <ComponentRef Id="borderlands2.dll" />
@@ -180,7 +166,6 @@
       <ComponentRef Id="etqw.dll" />
       <ComponentRef Id="gmod.dll" />
       <ComponentRef Id="gtaiv.dll" />
-      <ComponentRef Id="gtav.dll" />
       <ComponentRef Id="gw.dll" />
       <ComponentRef Id="hl2dm.dll" />
       <ComponentRef Id="insurgency.dll" />
@@ -199,7 +184,28 @@
       <ComponentRef Id="ut3.dll" />
       <ComponentRef Id="wolfet.dll" />
       <ComponentRef Id="wow.dll" />
-      <ComponentRef Id="wow_x64.dll" />
     </ComponentGroup>
+    <?if $(sys.BUILDARCH) = "x64" ?>
+      <DirectoryRef Id="PluginFolder">
+        <Component Id="bf1.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bf1.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="bf4.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bf4.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="gtav.dll">
+          <File Source="$(var.SourceDir)\release\plugins\gtav.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="wow_x64.dll">
+          <File Source="$(var.SourceDir)\release\plugins\wow_x64.dll" KeyPath="yes" />
+        </Component>
+      </DirectoryRef>
+      <ComponentGroup Id="Plugins">
+        <ComponentRef Id="bf1.dll" />
+        <ComponentRef Id="bf4.dll" />
+        <ComponentRef Id="gtav.dll" />
+        <ComponentRef Id="wow_x64.dll" />
+      </ComponentGroup>
+    <?endif ?>
   </Fragment>
 </Wix>