Skip to content

Commit

Permalink
Replace QuickNES core with QuickerNES (squashed PR #3839)
Browse files Browse the repository at this point in the history
resolves #3848
  • Loading branch information
SergioMartin86 authored Mar 22, 2024
1 parent 0857dd6 commit 9c4a818
Show file tree
Hide file tree
Showing 101 changed files with 461 additions and 18,041 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
/test_output
**/ipch/**
/Assets/dll/*.wbx
Backup/
UpgradeLog.htm

*.ilk
*.il
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@
[submodule "ExternalProjects/SDL2/libusb"]
path = ExternalProjects/SDL2/libusb
url = https://github.com/libusb/libusb.git
[submodule "quicknes/core"]
path = quicknes/core
url = https://github.com/SergioMartin86/quickerNES.git
Binary file modified Assets/dll/libquicknes.dll
Binary file not shown.
Binary file removed Assets/dll/libquicknes.dll.so.0.7.0
Binary file not shown.
Binary file added Assets/dll/libquicknes.so
Binary file not shown.
2 changes: 1 addition & 1 deletion Dist/Package.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "$1" = "windows-x64" ]; then
rm -f "EmuHawkMono.sh"
cd "dll"
rm -f "libe_sqlite3.so" "libSDL2.so" "OpenTK.dll.config" \
"libbizlynx.dll.so" "libbizswan.dll.so" "libblip_buf.so" "libbizhash.so" "libdarm.so" "libemu83.so" "libencore.so" "libfwunpack.so" "libgambatte.so" "libLibretroBridge.so" "libquicknes.dll.so.0.7.0" "librcheevos.so" "libsameboy.so" "libmgba.dll.so" "libMSXHawk.so" "libwaterboxhost.so"
"libbizlynx.dll.so" "libbizswan.dll.so" "libblip_buf.so" "libbizhash.so" "libdarm.so" "libemu83.so" "libencore.so" "libfwunpack.so" "libgambatte.so" "libLibretroBridge.so" "libquicknes.dll.so" "librcheevos.so" "libsameboy.so" "libmgba.dll.so" "libMSXHawk.so" "libwaterboxhost.so"
else
find . -type f -name "*.sh" -exec chmod +x {} \; # installed with -m644 but needs to be 755
cd "dll"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ MSX | **MSXHawk**
N64 | Ares64, **Mupen64Plus**
NDS | **melonDS**
Neo Geo Pocket | **NeoPop**
NES | **NesHawk**, QuickNes
NES | **NesHawk**, quickerNES
Odyssey² | **O2Hawk**
PC-FX | **T.S.T.**
Playstation (PSX) | **Nymashock**, **Octoshock**
Expand Down
6 changes: 3 additions & 3 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Jump to:
- [NLua](#nlua)
- [Nyma cores](#nyma-cores)
- [Octoshock](#octoshock)
- [QuickNES](#quicknes)
- [quickerNES](#quickernes)
- [Roslyn Analyzers](#roslyn-analyzers)
- [Virtu](#virtu)
- [Waterbox (host)](#waterbox-host)
Expand Down Expand Up @@ -264,8 +264,8 @@ Uses C++.



## QuickNES
> The unmanaged side of the QuickNES core.
## quickerNES
> The unmanaged side of the quickerNES core.
Uses C++.

Expand Down
Loading

0 comments on commit 9c4a818

Please sign in to comment.