ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Installer - fixes due to name changes, new projects, removed projects, etc. I didn't test this, so I may not have done this properly. Remove 4.5 installer, since we no longer have a 4.5 project

This commit is contained in:
adelikat 2013-11-03 14:19:02 +00:00
parent 2582069591
commit 5aa0122760
3 changed files with 13 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BizHawk.Installer/BizHawk.Installer_v4.5.wixproj
View File

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.7</ProductVersion>
<ProjectGuid>{a1a56bc8-8199-4c8d-b5c9-76401d3a0a70}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>BizHawk.Installer</OutputName>
<OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug;dotnet45=1;</DefineConstants>
<WixVariables>
</WixVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="BizHawkFiles.wxs" />
<Compile Include="BizHawkInstall.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name>
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

13
BizHawk.Installer/BizHawkFiles.wxs
View File

@ -4,8 +4,8 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
<Directory Id="BIZHAWK" Name="BizHawk">
<Component Id="BIZHAWK.MULTICLIENT.EXE" DiskId="1" Guid="E79C65FA-36FC-4D00-80F2-45AA1118E25B">
<File Id="BIZHAWK.MULTICLIENT.EXE" Name="BizHawk.MultiClient.exe" Source="..\BizHawk.MultiClient\output\BizHawk.MultiClient.exe">
<Component Id="EMUHAWK.EXE" DiskId="1" Guid="E79C65FA-36FC-4D00-80F2-45AA1118E25B">
<File Id="EMUHAWK.EXE" Name="EmuHawk.exe" Source="..\output\EmuHawk.exe">
<Shortcut Id="desktopShortcut" Directory="DesktopFolder" Name="BizHawk" WorkingDirectory="INSTALLDIR" Advertise="yes" Icon="BizHawkIcon.exe" IconIndex="0" />
<netfx:NativeImage Id="ngen_BizHawk.exe" Platform="32bit" Priority="0" AppBaseDirectory="BIZHAWK" />
<Shortcut Id="BizhawkStartShortcut" Directory="ProgramMenuDir" Name="BizHawk" Advertise="yes" Icon="BizHawkIcon.exe" IconIndex="0" />
@ -15,7 +15,7 @@
<File Id="DEFCTRL.JSON" Name="defctrl.json" Source="..\BizHawk.MultiClient\output\defctrl.json" />
</Component>
<Component Id="DISCOHAWK.EXE" DiskId="1" Guid="479DBA0A-777D-454A-A2FC-769067A8CAD5">
<File Id="DISCOHAWK.EXE" Name="DiscoHawk.exe" Source="..\BizHawk.MultiClient\output\DiscoHawk.exe">
<File Id="DISCOHAWK.EXE" Name="DiscoHawk.exe" Source="..\output\DiscoHawk.exe">
<Shortcut Id="DiscoStartShortcut" Directory="ProgramMenuDir" Name="DiscoHawk" Advertise="yes" Icon="DiscoHawkIcon.exe" IconIndex="0" />
<netfx:NativeImage Id="ngen_DiscoHawk.exe" Platform="32bit" Priority="0" AppBaseDirectory="BIZHAWK" />
</File>
@ -30,8 +30,11 @@
<Component Id="BIZHAWK.EMULATION.DLL" DiskId="1" Guid="5226EA11-7AC9-44CA-B2D4-2FCF9637C62E">
<File Id="BIZHAWK.EMULATION.DLL" Name="BizHawk.Emulation.dll" Source="..\BizHawk.MultiClient\output\dll\BizHawk.Emulation.dll" />
</Component>
<Component Id="BIZHAWK.UTIL.DLL" DiskId="1" Guid="4C40953E-8A1A-42A9-B337-795A72A6B0EE">
<File Id="BIZHAWK.UTIL.DLL" Name="BizHawk.Util.dll" Source="..\BizHawk.MultiClient\output\dll\BizHawk.Util.dll" />
<Component Id="BIZHAWK.CLIENT.COMMON.DLL" DiskId="1" Guid="4C40953E-8A1A-42A9-B337-795A72A6B0EE">
<File Id="BIZHAWK.UTIL.DLL" Name="BizHawk.Client.Common.dll" Source="..\output\dll\BizHawk.Client.Common.dll" />
</Component>
<Component Id="BIZHAWK.COMMON.DLL" DiskId="1" Guid="4C40953E-8A1A-42A9-B337-795A72A6B0EE">
<File Id="BIZHAWK.UTIL.DLL" Name="BizHawk.Common.dll" Source="..\output\dll\BizHawk.Common.dll" />
</Component>
<Component Id="BLIP_BUF.DLL" DiskId="1" Guid="E6822154-601C-4819-9CBA-8F2F8CA2415A">
<File Id="BLIP_BUF.DLL" Name="blip_buf.dll" Source="..\BizHawk.MultiClient\output\dll\blip_buf.dll" />

9
BizHawk.Installer/BizHawkInstall.wxs
View File

@ -8,12 +8,13 @@
if they want to install DiscoHawk, Gameboy Palettes, or the Bundled LUA scripts during the install process.
All features are installed by default. -->
<Feature Id="DefaultFeature" Title="BizHawk Emulator" Level="1">
<ComponentRef Id="BIZHAWK.MULTICLIENT.EXE" />
<ComponentRef Id="EMUHAWK.EXE" />
<ComponentRef Id="DEFCTRL.JSON" />
<ComponentRef Id="_7Z.DLL" />
<ComponentRef Id="AT3PLUSDECODER.DLL" />
<ComponentRef Id="BIZHAWK.EMULATION.DLL" />
<ComponentRef Id="BIZHAWK.UTIL.DLL" />
<ComponentRef Id="BIZHAWK.CLIENT.COMMON.DLL" />
<ComponentRef Id="BIZHAWK.COMMON.DLL" />
<ComponentRef Id="BLIP_BUF.DLL" />
<ComponentRef Id="EMU7800.DLL" />
<ComponentRef Id="FFMPEG.EXE" />
@ -301,7 +302,7 @@
<RegistrySearch Id="DirectX90Ccheck" Root="HKLM" Key="Software\Microsoft\DirectX" Name="Version" Type="raw" />
</Property>
<Condition Message="This application requires DirectX 9.0c or later">Installed OR DIRECTX90C="4.09.00.0904" OR DIRECTX90C="4.09.0000.0904"</Condition>
<Icon Id="BizHawkIcon.exe" SourceFile="..\BizHawk.MultiClient\output\BizHawk.MultiClient.exe" />
<Icon Id="DiscoHawkIcon.exe" SourceFile="..\BizHawk.MultiClient\output\DiscoHawk.exe" />
<Icon Id="BizHawkIcon.exe" SourceFile="..\output\EmuHawk.exe" />
<Icon Id="DiscoHawkIcon.exe" SourceFile="..\output\DiscoHawk.exe" />
</Product>
</Wix>