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

now remove traces of psx from the current project, so it doesnt confuse any users

This commit is contained in:
zeromus 2012-02-24 20:45:27 +00:00
parent 8b3246a510
commit f801d04a46
4 changed files with 15 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Emulation/BizHawk.Emulation.csproj
View File

@ -164,7 +164,6 @@
<Compile Include="Consoles\PC Engine\MemoryMap.Populous.cs" /> <Compile Include="Consoles\PC Engine\MemoryMap.Populous.cs" />
<Compile Include="Consoles\PC Engine\ScsiCDBus.cs" /> <Compile Include="Consoles\PC Engine\ScsiCDBus.cs" />
<Compile Include="Consoles\PC Engine\TurboCD.cs" /> <Compile Include="Consoles\PC Engine\TurboCD.cs" />
<Compile Include="Consoles\PSX\PSX.cs" />
<Compile Include="Consoles\Sega\Genesis\Input.cs" /> <Compile Include="Consoles\Sega\Genesis\Input.cs" />
<Compile Include="Consoles\Sega\SMS\MemoryMap.CodeMasters.cs" /> <Compile Include="Consoles\Sega\SMS\MemoryMap.CodeMasters.cs" />
<Compile Include="Consoles\Sega\SMS\MemoryMap.Sega.cs" /> <Compile Include="Consoles\Sega\SMS\MemoryMap.Sega.cs" />
@ -311,10 +310,7 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\PsxHawk.API\PsxHawk.API.vcxproj"> <Folder Include="Consoles\PSX\" />
<Project>{E160DA07-E926-4C7B-8A38-D45F4FE16725}</Project>
<Name>PsxHawk.API</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

4
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -438,10 +438,6 @@
<Project>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</Project> <Project>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</Project>
<Name>BizHawk.Util</Name> <Name>BizHawk.Util</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\PsxHawk.API\PsxHawk.API.vcxproj">
<Project>{E160DA07-E926-4C7B-8A38-D45F4FE16725}</Project>
<Name>PsxHawk.API</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="AboutBox.resx"> <EmbeddedResource Include="AboutBox.resx">

27
BizHawk.MultiClient/MainForm.cs
View File

@ -75,7 +75,7 @@ namespace BizHawk.MultiClient
if (Global.Config.ShowLogWindow) if (Global.Config.ShowLogWindow)
{ {
LogConsole.ShowConsole(); LogConsole.ShowConsole();
PsxApi.StdioFixes(); //PsxApi.StdioFixes();
displayLogWindowToolStripMenuItem.Checked = true; displayLogWindowToolStripMenuItem.Checked = true;
} }
@ -930,17 +930,18 @@ namespace BizHawk.MultiClient
try try
{ {
if (file.Extension.ToLower() == ".exe") //if (file.Extension.ToLower() == ".exe")
{ //{
PSX psx = new PSX(); // PSX psx = new PSX();
nextEmulator = psx; // nextEmulator = psx;
psx.LoadFile(file.CanonicalFullPath); // psx.LoadFile(file.CanonicalFullPath);
game = new GameInfo(); // game = new GameInfo();
game.System = "PSX"; // game.System = "PSX";
game.Name = "xx"; // game.Name = "xx";
game.Hash = "xx"; // game.Hash = "xx";
} //}
else if (file.Extension.ToLower() == ".iso") //else
if (file.Extension.ToLower() == ".iso")
{ {
//if (Global.PsxCoreLibrary.IsOpen) //if (Global.PsxCoreLibrary.IsOpen)
//{ //{
@ -2138,7 +2139,7 @@ namespace BizHawk.MultiClient
//"Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ROM;*.ZIP;*.7z|NES (*.NES)|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|TI-83|*.rom|Archive Files|*.zip;*.7z|Savestate|*.state|All Files|*.*"; //"Rom Files|*.NES;*.SMS;*.GG;*.SG;*.PCE;*.SGX;*.GB;*.BIN;*.SMD;*.ROM;*.ZIP;*.7z|NES (*.NES)|*.NES|Master System|*.SMS;*.GG;*.SG;*.ZIP;*.7z|PC Engine|*.PCE;*.SGX;*.ZIP;*.7z|Gameboy|*.GB;*.ZIP;*.7z|TI-83|*.rom|Archive Files|*.zip;*.7z|Savestate|*.state|All Files|*.*";
ofd.Filter = FormatFilter( ofd.Filter = FormatFilter(
"Rom Files", "*.nes;*.sms;*.gg;*.sg;*.pce;*.sgx;*.gb;*.bin;*.gen;*.smd;*.rom;*.cue;*.exe;%ARCH%", "Rom Files", "*.nes;*.sms;*.gg;*.sg;*.pce;*.sgx;*.gb;*.bin;*.gen;*.smd;*.rom;*.cue;*.exe;%ARCH%",
"PSX Executables", "*.exe", //"PSX Executables", "*.exe",
"Disc Images", "*.cue", "Disc Images", "*.cue",
"NES", "*.nes;%ARCH%", "NES", "*.nes;%ARCH%",
"Master System", "*.sms;*.gg;*.sg;%ARCH%", "Master System", "*.sms;*.gg;*.sg;%ARCH%",

30
BizHawk.sln
View File

@ -6,19 +6,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Util", "BizHawk.Util\BizHawk.Util.csproj", "{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Util", "BizHawk.Util\BizHawk.Util.csproj", "{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizHawk.MultiClient\BizHawk.MultiClient.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.MultiClient", "BizHawk.MultiClient\BizHawk.MultiClient.csproj", "{DD448B37-BA3F-4544-9754-5406E8094723}"
ProjectSection(ProjectDependencies) = postProject
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25} = {7B67D95B-29E0-4F9D-9767-42C35CEC3F25}
EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoHawk", "DiscoHawk\DiscoHawk.csproj", "{C4366030-6D03-424B-AE53-F4F43BB217C3}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PsxHawk.Core", "PsxHawk.Core\PsxHawk.Core.vcxproj", "{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PsxHawk.API", "PsxHawk.API\PsxHawk.API.vcxproj", "{E160DA07-E926-4C7B-8A38-D45F4FE16725}"
ProjectSection(ProjectDependencies) = postProject
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25} = {7B67D95B-29E0-4F9D-9767-42C35CEC3F25}
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -77,26 +67,6 @@ Global
{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.ActiveCfg = Release|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.ActiveCfg = Release|Any CPU
{C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.Build.0 = Release|Any CPU {C4366030-6D03-424B-AE53-F4F43BB217C3}.Release|Win32.Build.0 = Release|Any CPU
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Any CPU.ActiveCfg = Debug|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Win32.ActiveCfg = Debug|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Debug|Win32.Build.0 = Debug|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Any CPU.ActiveCfg = Release|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Mixed Platforms.Build.0 = Release|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Win32.ActiveCfg = Release|Win32
{7B67D95B-29E0-4F9D-9767-42C35CEC3F25}.Release|Win32.Build.0 = Release|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Any CPU.ActiveCfg = Debug|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Win32.ActiveCfg = Debug|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Debug|Win32.Build.0 = Debug|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Any CPU.ActiveCfg = Release|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Mixed Platforms.Build.0 = Release|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Win32.ActiveCfg = Release|Win32
{E160DA07-E926-4C7B-8A38-D45F4FE16725}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE