Skip to content
Open
Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
3469daa
Adding base
Mar 30, 2025
e13a90e
progress
SergioMartin86 Mar 31, 2025
734b8b6
Building
SergioMartin86 Mar 31, 2025
35e7097
Fixing memareas
SergioMartin86 Mar 31, 2025
308489d
Adding base
Mar 31, 2025
f2f676b
Progress
Mar 31, 2025
cc6dcc6
updates to bizhawk
SergioMartin86 Apr 1, 2025
5e814a4
Taking ppsspp out of waterbox, trying to run it ported
SergioMartin86 Apr 1, 2025
c6690c8
renaming old implementation to _wbx before adding the ported one
Apr 1, 2025
9a2b83f
creating adapted psp
Apr 2, 2025
dcee9e7
Revert "creating adapted psp"
Apr 2, 2025
18e3cea
Revert "renaming old implementation to _wbx before adding the ported …
Apr 2, 2025
54cd643
Reverting some changes, removing waterbox base class
Apr 2, 2025
0248846
Stable base for new PPSSPP core
Apr 2, 2025
ffc9bee
Added msvc
SergioMartin86 Apr 2, 2025
1c6b245
[WIP] working on windows compilation
Apr 2, 2025
31f0e68
Compiling but still not linking
Apr 3, 2025
c355b96
Progress
Apr 3, 2025
a6307dd
Producing dll
Apr 3, 2025
c9f40dd
Progress
Apr 6, 2025
201234a
ported running
Apr 6, 2025
fffac3d
Now running on windows with ffmpeg
Apr 6, 2025
8db0c7c
Updating ppsspp
Apr 6, 2025
884a3a5
Progress with ported
Apr 7, 2025
42d0ed7
updates
Apr 7, 2025
8581fdc
Properly working with myst
Apr 8, 2025
8b4c7ff
Updates
Apr 8, 2025
f01ebf3
Load/save working
Apr 9, 2025
0c1e56e
Proper load/save and controllers fixed
Apr 9, 2025
83b3276
Preventing crash on save dialog
Apr 10, 2025
82c1c82
compiling on linux
SergioMartin86 Apr 12, 2025
348bdf7
Preserving symbols
SergioMartin86 Apr 12, 2025
d9c3a3c
Adding gitignore
SergioMartin86 Apr 12, 2025
d141beb
Progress
Apr 12, 2025
55f7c9d
Adding sdl config
SergioMartin86 Apr 12, 2025
5b572e6
Merge branch 'ppsspp' of github.com:SergioMartin86/BizHawk into ppsspp
SergioMartin86 Apr 12, 2025
b8616ed
Windows now compiling. Font error fixed
Apr 12, 2025
1a554da
built linux
SergioMartin86 Apr 13, 2025
4056962
Adding UI fonts
Apr 13, 2025
00e08dc
Resync with upstream
Apr 13, 2025
6c1f272
Detecting inputs
Apr 13, 2025
f1a8d12
Updating linux compilation
SergioMartin86 Apr 13, 2025
5264b63
adding sound
Apr 15, 2025
4fe2c00
Added sound
Apr 15, 2025
b09b6bc
Remove unused imports
YoshiRulz May 12, 2025
e20ec72
Fix line-end whitespace
YoshiRulz May 12, 2025
3ce4368
Use `#if false` for commented-out code blocks
YoshiRulz May 12, 2025
80395e1
Uploading release lib instead of debug for testing purposes
Aug 9, 2025
ef91217
Rebasing
Aug 9, 2025
7160aef
Addressing comments and fixing warnings
Aug 9, 2025
ce02456
Addressing styler complaints
Aug 9, 2025
6445b6b
Addressing styler complaints
Aug 9, 2025
101085d
Removing settings
Aug 9, 2025
8a9baf5
Addressing comments
Aug 9, 2025
70052fa
attempting to make ppsspp in linux load the proper dll, still failing
SergioMartin86 Aug 9, 2025
6032938
fixing proper dynamic linking
SergioMartin86 Aug 9, 2025
5c224df
Adding missing libs for ppsspp, proper linking, and disabling problem…
SergioMartin86 Aug 9, 2025
5147136
Adding missing symbolic links
SergioMartin86 Aug 9, 2025
f841236
Addressing comments
Aug 9, 2025
1da019c
Adding missing SDL symlink
SergioMartin86 Aug 10, 2025
e962d97
Merge branch 'ppsspp' of github.com:SergioMartin86/BizHawk into ppsspp
SergioMartin86 Aug 10, 2025
a464c80
use static ffmpeg libraries
Morilli Aug 12, 2025
11d56d0
forgot make install
Morilli Aug 12, 2025
38c95fb
Revert changes to VS Code dotfiles
YoshiRulz Aug 13, 2025
4795e8f
Update PPSSPP.IVideoProvider.cs
SergioMartin86 Aug 13, 2025
fcb310b
Remove Right Analog
Spikestuff Aug 13, 2025
8c3c362
Remove Right Analog
Spikestuff Aug 13, 2025
21b6de5
Remove Right Analog
Spikestuff Aug 13, 2025
2966653
fix submodule names
Morilli Aug 13, 2025
77e93ed
alphabetise in `RomLoader.MakeGameFromDisc`
YoshiRulz Aug 14, 2025
f56a467
Remove debugging print
YoshiRulz Aug 14, 2025
45935d6
Unimplement `ISettable<,>` service on `PPSSPP`
YoshiRulz Aug 14, 2025
37a410f
Merge pull request #1 from Spikestuff/ppsspp
SergioMartin86 Aug 15, 2025
83a8684
Using temp folder for files
Aug 15, 2025
e2e0f3a
Merge branch 'ppsspp' of github.com:SergioMartin86/BizHawk into ppsspp
Aug 15, 2025
9fe5a8d
Fixing rewind, changing compiler to clang, fixing video having 2 more…
Aug 15, 2025
384dd0a
Pushing linux lib
SergioMartin86 Aug 15, 2025
807b4ec
Fixing analyzer error
Aug 15, 2025
49549d6
remove SDL submodule
Morilli Aug 15, 2025
98e64a9
Fixing video resolution height 270 -> 272
Aug 15, 2025
8957808
Merge branch 'ppsspp' of github.com:SergioMartin86/BizHawk into ppsspp
Aug 15, 2025
3485871
fix retro_log_printf_callback
Morilli Aug 18, 2025
c2b96da
fix UB causing divide by zero exceptions
Morilli Aug 18, 2025
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
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@
path = waterbox/dsda/core
url = https://github.com/TASEmulators/dsda-doom.git
branch = wbx
[submodule "waterbox/ppsspp/ppsspp"]
path = ppsspp/ppsspp
url = https://github.com/TASEmulators/ppsspp.git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which branch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@vadosnaprimer vadosnaprimer Apr 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to always keep hawk specific changes rebased on top of upstream branch that we rely on. And each time we pull upstream and rebase anew we would increment our branch version like this: wbx-1, wbx-2, etc, so every rebase is a new branch, because it basically changes history, which we want to preserve it on every update. This is better than merging upsream changes because that makes our changes harder to find over time.

And yeah please explicitly put the branch into this file, that way it's clear where the code is coming from. Only pointing to commit can result in detached head and that commit can belong to different branches, making future maintenance more annoying.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see the wbx branch in the repo now but not in .gitmodules...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, this is strange. This core isn't wbxed; it's ported. This every must be a residual from when I tried to wbx it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah LOL indeed. Then the usual name for it is bizhawk.

[submodule "waterbox/ppsspp/jaffarCommon"]
path = ppsspp/jaffarCommon
url = https://github.com/SergioMartin86/jaffarCommon.git
[submodule "ppsspp/SDL"]
path = ppsspp/SDL
url = https://github.com/libsdl-org/SDL.git
[submodule "waterbox/opera/opera-libretro"]
path = waterbox/opera/opera-libretro
url = https://github.com/TASEmulators/opera-libretro.git
Expand Down
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,13 @@
"editor.tabSize": 4,
"search.exclude": {
"waterbox/**": true
},
"files.associations": {
"*.jaffar": "json",
"array": "cpp",
"bitset": "cpp",
"string_view": "cpp",
"initializer_list": "cpp",
"span": "cpp"
}
}
Binary file added Assets/dll/libSDL2-2.0.so
Binary file not shown.
Binary file added Assets/dll/libavcodec.so
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/dll/libavcodec.so.57
Binary file added Assets/dll/libavformat.so
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/dll/libavformat.so.57
Binary file added Assets/dll/libavutil.so
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/dll/libavutil.so.55
Binary file added Assets/dll/libppsspp.dll
Binary file not shown.
Binary file added Assets/dll/libppsspp.so
Binary file not shown.
Binary file added Assets/dll/libswresample.so
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/dll/libswresample.so.2
Binary file added Assets/dll/libswscale.so
Binary file not shown.
1 change: 1 addition & 0 deletions Assets/dll/libswscale.so.4
4 changes: 4 additions & 0 deletions ppsspp/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
obj
Assets
.o
.so
1 change: 1 addition & 0 deletions ppsspp/SDL
Submodule SDL added at 235938
Loading
Loading