Skip to content

Drop Octoshock #4180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ UpgradeLog.htm
.hgignore
.hgtags

/psx/octoshock/bizhawk/Win32
/psx/octoshock/bizhawk/x64
/psx/octoshock/bizhawk/*.opendb

**/StyleCop.Cache
/waterbox/**/*.wbx
/waterbox/**/*.wbx.in
Expand Down
Binary file removed Assets/dll/octoshock.dll
Binary file not shown.
1 change: 0 additions & 1 deletion Building Other Solutions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ wonderswan: use wonderswan/msvc/bizswan.sln
libretrobridge: use LibretroBridge/msvc/LibretroBridge.sln
quicknes: use quicknes/msvc/libquicknes.sln
gambatte: use submodules/gambatte/bizhawk/msvc/libgambatte.sln
octoshock (psx): use psx/octoshock/bizhawk/octoshock.sln

libmupen64plus:
Use mupen64plus-sln/projects/msvc11/mupen64plus.sln.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ Neo Geo Pocket | **NeoPop**
NES | **NesHawk**, quickerNES
Odyssey² | **O2Hawk**
PC-FX | **T.S.T.**
Playstation (PSX) | **Nymashock**, **Octoshock**
Playstation (PSX) | **Nymashock**
Sega 32X | **PicoDrive**
Sega Game Gear | **SMSHawk**
Sega Genesis | **Genplus-gx**
Expand Down
8 changes: 0 additions & 8 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Jump to:
- [MSXHawk](#msxhawk)
- [NLua](#nlua)
- [Nyma cores](#nyma-cores)
- [Octoshock](#octoshock)
- [quickerNES](#quickernes)
- [Roslyn Analyzers](#roslyn-analyzers)
- [Virtu](#virtu)
Expand Down Expand Up @@ -260,13 +259,6 @@ See [Waterbox (toolchain + cores)](#waterbox-toolchain--cores).



## Octoshock
> The unmanaged side of the Octoshock core from Mednafen.

Uses C++.



## quickerNES
> The unmanaged side of the quickerNES core.

Expand Down
349 changes: 0 additions & 349 deletions psx/mednadisc/FileStream.cpp

This file was deleted.

Loading