Move 7z stuff from Bizhawk.Util to BizHawk.Multiclient and delete the Bizhawk.Util project
This commit is contained in:
adelikat
parent
61bd10e84d
commit
17f5c63273
|
|
@ -60,6 +60,7 @@
|
|||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
<DefineConstants>WINDOWS;DOTNET20;UNMANAGED;COMPRESS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<NoWin32Manifest>true</NoWin32Manifest>
|
||||
|
|
@ -104,6 +105,42 @@
|
|||
<Compile Include="..\VersionInfo.cs">
|
||||
<Link>VersionInfo.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="7z\ArchiveEmulationStreamProxy.cs" />
|
||||
<Compile Include="7z\ArchiveExtractCallback.cs" />
|
||||
<Compile Include="7z\ArchiveOpenCallback.cs" />
|
||||
<Compile Include="7z\ArchiveUpdateCallback.cs" />
|
||||
<Compile Include="7z\COM.cs" />
|
||||
<Compile Include="7z\Common.cs" />
|
||||
<Compile Include="7z\EventArgs.cs" />
|
||||
<Compile Include="7z\Exceptions.cs" />
|
||||
<Compile Include="7z\FileSignatureChecker.cs" />
|
||||
<Compile Include="7z\Formats.cs" />
|
||||
<Compile Include="7z\LibraryFeature.cs" />
|
||||
<Compile Include="7z\LibraryManager.cs" />
|
||||
<Compile Include="7z\LzmaDecodeStream.cs" />
|
||||
<Compile Include="7z\LzmaEncodeStream.cs" />
|
||||
<Compile Include="7z\LzmaProgressCallback.cs" />
|
||||
<Compile Include="7z\NativeMethods.cs" />
|
||||
<Compile Include="7z\sdk\Common\CRC.cs" />
|
||||
<Compile Include="7z\sdk\Common\InBuffer.cs" />
|
||||
<Compile Include="7z\sdk\Common\OutBuffer.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZMA\LzmaBase.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZMA\LzmaDecoder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZMA\LzmaEncoder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\IMatchFinder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\LzBinTree.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\LzInWindow.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\LzOutWindow.cs" />
|
||||
<Compile Include="7z\sdk\Compress\RangeCoder\RangeCoder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\RangeCoder\RangeCoderBit.cs" />
|
||||
<Compile Include="7z\sdk\Compress\RangeCoder\RangeCoderBitTree.cs" />
|
||||
<Compile Include="7z\sdk\ICoder.cs" />
|
||||
<Compile Include="7z\SevenZipCompressor.cs" />
|
||||
<Compile Include="7z\SevenZipCompressorAsynchronous.cs" />
|
||||
<Compile Include="7z\SevenZipExtractor.cs" />
|
||||
<Compile Include="7z\SevenZipExtractorAsynchronous.cs" />
|
||||
<Compile Include="7z\SevenZipSfx.cs" />
|
||||
<Compile Include="7z\StreamWrappers.cs" />
|
||||
<Compile Include="AboutBox.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
|
|
@ -955,6 +992,16 @@
|
|||
<EmbeddedResource Include="tools\Watch\WatchEditor.resx">
|
||||
<DependentUpon>WatchEditor.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<None Include="7z\arch\Test.bzip2.7z" />
|
||||
<None Include="7z\arch\Test.lzma.7z" />
|
||||
<None Include="7z\arch\Test.lzma2.7z" />
|
||||
<None Include="7z\arch\Test.ppmd.7z" />
|
||||
<None Include="7z\arch\Test.rar" />
|
||||
<None Include="7z\arch\Test.tar" />
|
||||
<None Include="7z\arch\Test.txt.bz2" />
|
||||
<None Include="7z\arch\Test.txt.gz" />
|
||||
<None Include="7z\arch\Test.txt.xz" />
|
||||
<None Include="7z\arch\Test.zip" />
|
||||
<None Include="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
|
|
@ -999,10 +1046,6 @@
|
|||
<Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
|
||||
<Name>BizHawk.Emulation</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\BizHawk.Util\BizHawk.Util.csproj">
|
||||
<Project>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</Project>
|
||||
<Name>BizHawk.Util</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="AboutBox.resx">
|
||||
|
|
@ -1178,6 +1221,7 @@
|
|||
<None Include="images\Both.png" />
|
||||
<None Include="config\ControllerImages\A78Joystick.png" />
|
||||
<None Include="config\ControllerImages\IntVController.png" />
|
||||
<Content Include="7z\arch\Test.txt" />
|
||||
<Content Include="config\ControllerImages\N64.png" />
|
||||
<Content Include="config\ControllerImages\SaturnController.jpg" />
|
||||
<None Include="images\addWatch.ico" />
|
||||
|
|
|
|||
|
|
@ -81,10 +81,6 @@
|
|||
<Project>{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}</Project>
|
||||
<Name>BizHawk.Emulation</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\BizHawk.Util\BizHawk.Util.csproj">
|
||||
<Project>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</Project>
|
||||
<Name>BizHawk.Util</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,166 +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)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BizHawk</RootNamespace>
|
||||
<AssemblyName>BizHawk.Util</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<UpgradeBackupLocation />
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;DOTNET20;UNMANAGED;COMPRESS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE;DOTNET20;UNMANAGED;COMPRESS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml.Linq">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.DataSetExtensions">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\VersionInfo.cs">
|
||||
<Link>VersionInfo.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="7z\ArchiveEmulationStreamProxy.cs" />
|
||||
<Compile Include="7z\ArchiveExtractCallback.cs" />
|
||||
<Compile Include="7z\ArchiveOpenCallback.cs" />
|
||||
<Compile Include="7z\ArchiveUpdateCallback.cs" />
|
||||
<Compile Include="7z\COM.cs" />
|
||||
<Compile Include="7z\Common.cs" />
|
||||
<Compile Include="7z\EventArgs.cs" />
|
||||
<Compile Include="7z\Exceptions.cs" />
|
||||
<Compile Include="7z\FileSignatureChecker.cs" />
|
||||
<Compile Include="7z\Formats.cs" />
|
||||
<Compile Include="7z\LibraryFeature.cs" />
|
||||
<Compile Include="7z\LibraryManager.cs" />
|
||||
<Compile Include="7z\LzmaDecodeStream.cs" />
|
||||
<Compile Include="7z\LzmaEncodeStream.cs" />
|
||||
<Compile Include="7z\LzmaProgressCallback.cs" />
|
||||
<Compile Include="7z\NativeMethods.cs" />
|
||||
<Compile Include="7z\sdk\Common\CRC.cs" />
|
||||
<Compile Include="7z\sdk\Common\InBuffer.cs" />
|
||||
<Compile Include="7z\sdk\Common\OutBuffer.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZMA\LzmaBase.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZMA\LzmaDecoder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZMA\LzmaEncoder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\IMatchFinder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\LzBinTree.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\LzInWindow.cs" />
|
||||
<Compile Include="7z\sdk\Compress\LZ\LzOutWindow.cs" />
|
||||
<Compile Include="7z\sdk\Compress\RangeCoder\RangeCoder.cs" />
|
||||
<Compile Include="7z\sdk\Compress\RangeCoder\RangeCoderBit.cs" />
|
||||
<Compile Include="7z\sdk\Compress\RangeCoder\RangeCoderBitTree.cs" />
|
||||
<Compile Include="7z\sdk\ICoder.cs" />
|
||||
<Compile Include="7z\SevenZipCompressor.cs" />
|
||||
<Compile Include="7z\SevenZipCompressorAsynchronous.cs" />
|
||||
<Compile Include="7z\SevenZipExtractor.cs" />
|
||||
<Compile Include="7z\SevenZipExtractorAsynchronous.cs" />
|
||||
<Compile Include="7z\SevenZipSfx.cs" />
|
||||
<Compile Include="7z\StreamWrappers.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Properties\svnrev.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="7z\arch\Test.bzip2.7z" />
|
||||
<EmbeddedResource Include="7z\arch\Test.lzma.7z" />
|
||||
<EmbeddedResource Include="7z\arch\Test.lzma2.7z" />
|
||||
<EmbeddedResource Include="7z\arch\Test.ppmd.7z" />
|
||||
<EmbeddedResource Include="7z\arch\Test.rar" />
|
||||
<EmbeddedResource Include="7z\arch\Test.tar" />
|
||||
<EmbeddedResource Include="7z\arch\Test.txt.bz2" />
|
||||
<EmbeddedResource Include="7z\arch\Test.txt.gz" />
|
||||
<EmbeddedResource Include="7z\arch\Test.txt.xz" />
|
||||
<EmbeddedResource Include="7z\arch\Test.zip" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="7z\arch\Test.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BizHawk.Client.Common\BizHawk.Client.Common.csproj">
|
||||
<Project>{24A0AA3C-B25F-4197-B23D-476D6462DBA0}</Project>
|
||||
<Name>BizHawk.Client.Common</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)subwcrev.sh" "$(ProjectDir)"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("BizHawk.Util")]
|
||||
[assembly: AssemblyDescription("http://code.google.com/p/bizhawk")]
|
||||
[assembly: AssemblyCompany("BizHawk")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("53c04c97-2bac-4fa9-af11-2540b483674f")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]
|
||||
[assembly: AssemblyFileVersion(VersionInfo.MAINVERSION + "." + SubWCRev.SVN_REV)]
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
static class SubWCRev
|
||||
{
|
||||
public const string SVN_REV = "$WCREV$";
|
||||
}
|
||||
16
BizHawk.sln
16
BizHawk.sln
|
|
@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
|
|||
# Visual Studio 2010
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Emulation", "BizHawk.Emulation\BizHawk.Emulation.csproj", "{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Util", "BizHawk.Util\BizHawk.Util.csproj", "{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizHawk.MultiClient\BizHawk.MultiClient.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}"
|
||||
|
|
@ -39,20 +37,6 @@ Global
|
|||
{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.ActiveCfg = Release|Any CPU
|
||||
{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|Win32.Build.0 = Release|Any CPU
|
||||
{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.ActiveCfg = Debug|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|Win32.Build.0 = Debug|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.ActiveCfg = Release|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|Win32.Build.0 = Release|Any CPU
|
||||
{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DD448B37-BA3F-4544-9754-5406E8094723}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
|
|
|
|||
Loading…
Reference in New Issue