diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2016-10-30 00:00:07 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2016-10-30 00:00:07 +0300 |
| commit | 882ad7044ab4ae52de86cf729b6d830cba46e021 (patch) | |
| tree | 4fd8b5bb474ca194efa7815f64edb5c870c5e9e6 /installer | |
| parent | 0258d2a1e2cbe76fb5349171235679a2a434e63a (diff) | |
plugins: build x64 ones only when the target is x86_64
x64 plugins only work if Mumble is x64 too, this means that we should avoid building them with Mumble x86.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Plugins.wxs | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/installer/Plugins.wxs b/installer/Plugins.wxs index b1a4b302b..b3de1b850 100644 --- 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,33 @@ <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> + + <?if $(sys.BUILDARCH) = "x64" ?> + <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> + <?endif ?> </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 +181,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 +199,13 @@ <ComponentRef Id="ut3.dll" /> <ComponentRef Id="wolfet.dll" /> <ComponentRef Id="wow.dll" /> - <ComponentRef Id="wow_x64.dll" /> + + <?if $(sys.BUILDARCH) = "x64" ?> + <ComponentRef Id="bf1.dll" /> + <ComponentRef Id="bf4.dll" /> + <ComponentRef Id="gtav.dll" /> + <ComponentRef Id="wow_x64.dll" /> + <?endif ?> </ComponentGroup> </Fragment> -</Wix> +</Wix>
\ No newline at end of file |