Skip to content
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.

Sign up for GitHub

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

[WIP] Update mupen/gliden64 to 2.5.9 #1632

Closed
wants to merge 25 commits into from
Closed

[WIP] Update mupen/gliden64 to 2.5.9 #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
93f86b8
Mupen update core
JoeMatt Nov 11, 2021
72c7f8f
Mupen add depends header paths to build config
JoeMatt Nov 11, 2021
d040bd0
mupen update rsp cxd4
JoeMatt Nov 11, 2021
15c0c50
Mupen fix updated build
JoeMatt Nov 14, 2021
082c6fc
Mupen version bump 2.5.9
JoeMatt Nov 14, 2021
295b7c4
Save states fix potential db crash
JoeMatt Nov 14, 2021
1286ebd
mupen fix tvos build
JoeMatt Nov 14, 2021
f313d8f
tvOS find implicit depends
JoeMatt Nov 14, 2021
d06b285
mupen remove empty files
JoeMatt Nov 14, 2021
8eab0f4
Mupen update rice to upstream git
JoeMatt Nov 14, 2021
07fc580
Mupen rsp-hle
JoeMatt Nov 14, 2021
8f82bc4
Mupen update gliden64
JoeMatt Nov 14, 2021
4bb642d
mupen core feature updates
JoeMatt Nov 14, 2021
e82deeb
mupen change to gun++14 from 0x
JoeMatt Jan 4, 2022
32b04a0
mupen osd on debug only
JoeMatt Jan 4, 2022
388f54b
Add more mupen options
JoeMatt Dec 29, 2021
77dc252
options, temp workaround nested groups
JoeMatt Dec 29, 2021
8689de4
mupen: All the options!
JoeMatt Dec 29, 2021
96afb36
mupen VirtualGameController test
JoeMatt Dec 31, 2021
3cb03e1
mupen debug print
JoeMatt Dec 31, 2021
1279111
Rumble for controllers added (wip)
JoeMatt Jan 1, 2022
7f761db
controllers add protocols for keyboard and mouse
JoeMatt Jan 1, 2022
f80b20c
atari800: add atari 400/800 computer support
JoeMatt Jan 1, 2022
37dbe20
Merge branch 'feature/mupenoptions' into feature/UpdateMupen
JoeMatt Jan 4, 2022
5e99883
mupen fix a catalyst bug
JoeMatt Jan 4, 2022
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
21 changes: 21 additions & 0 deletions Cores/Atari800/Atari800Core/Source/ATR800GameCore.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,27 @@ int UI_SelectCartType(int k)
}
}

if([[_currentCore systemIdentifier] isEqualToString:@"com.provenance.atari8bit"])
{
// TODO: improve detection using MD5 lookup
switch (k)
{
case 2: return CARTRIDGE_STD_2;
case 4: return CARTRIDGE_STD_4;
case 8: return CARTRIDGE_STD_8;
case 16: return CARTRIDGE_STD_16;
case 32: return CARTRIDGE_XEGS_32;
case 40: return CARTRIDGE_BBSB_40;
case 64: return CARTRIDGE_XEGS_07_64;
case 128: return CARTRIDGE_XEGS_128;
case 256: return CARTRIDGE_XEGS_256;
case 512: return CARTRIDGE_XEGS_512;
case 1024: return CARTRIDGE_ATMAX_1024;
default:
return CARTRIDGE_NONE;
}
}

if([[_currentCore systemIdentifier] isEqualToString:@"com.provenance.5200"])
{
NSArray *One_Chip_16KB = @[@"a47fcb4eedab9418ea098bb431a407aa", // A.E. (Proto)
Expand Down
112 changes: 56 additions & 56 deletions Cores/Atari800/PVAtari800.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,101 +319,101 @@
026953E91431737E003A07D4 /* atari800 */ = {
isa = PBXGroup;
children = (
9491E464198C11A10075135C /* act */,
94DEA012171918D200073397 /* emuos.c */,
026953E214317379003A07D4 /* afile.c */,
0269541814317864003A07D4 /* antic.c */,
9491E45C1989B1CA0075135C /* artifact.c */,
026953E514317379003A07D4 /* atari.c */,
026953F414317689003A07D4 /* binload.c */,
026953EB14317649003A07D4 /* cartridge.c */,
026953ED14317649003A07D4 /* cassette.c */,
0269542B14317A53003A07D4 /* cfg.c */,
0269544C14318515003A07D4 /* colours_external.c */,
0269544E14318515003A07D4 /* colours_ntsc.c */,
0269545014318515003A07D4 /* colours_pal.c */,
0269545214318515003A07D4 /* colours.c */,
0269543F14317B21003A07D4 /* compfile.c */,
0269541B1431793F003A07D4 /* cpu.c */,
94DEA00F171918A200073397 /* crc32.c */,
94DEA010171918A200073397 /* crc32.h */,
9491E460198B0A8C0075135C /* cycle_map.c */,
0269541E1431797A003A07D4 /* devices.c */,
94DEA012171918D200073397 /* emuos.c */,
02695421143179A2003A07D4 /* esc.c */,
026953F7143176AE003A07D4 /* gtia.c */,
02695425143179E9003A07D4 /* ide.c */,
94DEA0091719186E00073397 /* img_tape.c */,
94DEA00A1719186E00073397 /* img_tape.h */,
02E763C61431958E008050EA /* input.c */,
02695412143177EF003A07D4 /* log.c */,
026953F9143176AE003A07D4 /* memory.c */,
0269543714317AC8003A07D4 /* monitor.c */,
0269543C14317B11003A07D4 /* mzpokeysnd.c */,
0269543114317A76003A07D4 /* pbi_bb.c */,
0269542E14317A63003A07D4 /* pbi_mio.c */,
0269543414317AAF003A07D4 /* pbi_scsi.c */,
026953FD143176E6003A07D4 /* pbi.c */,
0269542814317A43003A07D4 /* pia.c */,
02695400143176F4003A07D4 /* pokey.c */,
02695402143176F4003A07D4 /* pokeysnd.c */,
0269544214317B42003A07D4 /* remez.c */,
0269540F143177DF003A07D4 /* rtime.c */,
02695449143184CD003A07D4 /* screen.c */,
026954061431770E003A07D4 /* sio.c */,
0269540C1431775C003A07D4 /* sndsave.c */,
02669C741435806A0002A11B /* sound_oss.c */,
9491E45A1989AF050075135C /* sound.c */,
02E763AF143194CF008050EA /* statesav.c */,
94DEA00B1719186E00073397 /* sysrom.c */,
94DEA00C1719186F00073397 /* sysrom.h */,
026953EA143175F0003A07D4 /* config.h */,
0269541814317864003A07D4 /* antic.c */,
0269541914317864003A07D4 /* antic.h */,
9491E45C1989B1CA0075135C /* artifact.c */,
9491E45D1989B1CA0075135C /* artifact.h */,
026953E214317379003A07D4 /* afile.c */,
02E763C014319545008050EA /* ui_basic.c */,
02E763C214319545008050EA /* ui.c */,
026954091431771D003A07D4 /* util.c */,
026953E314317379003A07D4 /* afile.h */,
026953E414317379003A07D4 /* akey.h */,
026953E514317379003A07D4 /* atari.c */,
0269541914317864003A07D4 /* antic.h */,
9491E45D1989B1CA0075135C /* artifact.h */,
026953E614317379003A07D4 /* atari.h */,
026953F414317689003A07D4 /* binload.c */,
026953F514317689003A07D4 /* binload.h */,
026953EB14317649003A07D4 /* cartridge.c */,
026953EC14317649003A07D4 /* cartridge.h */,
026953ED14317649003A07D4 /* cassette.c */,
026953EE14317649003A07D4 /* cassette.h */,
0269542B14317A53003A07D4 /* cfg.c */,
0269542C14317A53003A07D4 /* cfg.h */,
0269544C14318515003A07D4 /* colours_external.c */,
0269544D14318515003A07D4 /* colours_external.h */,
0269544E14318515003A07D4 /* colours_ntsc.c */,
0269544F14318515003A07D4 /* colours_ntsc.h */,
0269545014318515003A07D4 /* colours_pal.c */,
0269545114318515003A07D4 /* colours_pal.h */,
0269545214318515003A07D4 /* colours.c */,
0269545314318515003A07D4 /* colours.h */,
0269543F14317B21003A07D4 /* compfile.c */,
0269544014317B21003A07D4 /* compfile.h */,
0269541B1431793F003A07D4 /* cpu.c */,
026953EA143175F0003A07D4 /* config.h */,
0269541C1431793F003A07D4 /* cpu.h */,
9491E460198B0A8C0075135C /* cycle_map.c */,
94DEA010171918A200073397 /* crc32.h */,
9491E461198B0A8C0075135C /* cycle_map.h */,
0269541E1431797A003A07D4 /* devices.c */,
0269541F1431797A003A07D4 /* devices.h */,
02252B371437A377001F3BF4 /* emuos.h */,
02695421143179A2003A07D4 /* esc.c */,
02695422143179A2003A07D4 /* esc.h */,
026953F7143176AE003A07D4 /* gtia.c */,
026953F8143176AE003A07D4 /* gtia.h */,
02695424143179E9003A07D4 /* ide_internal.h */,
02695425143179E9003A07D4 /* ide.c */,
02695426143179E9003A07D4 /* ide.h */,
02E763C61431958E008050EA /* input.c */,
94DEA00A1719186E00073397 /* img_tape.h */,
02E763C71431958E008050EA /* input.h */,
02695412143177EF003A07D4 /* log.c */,
02695413143177EF003A07D4 /* log.h */,
026953F9143176AE003A07D4 /* memory.c */,
026953FA143176AE003A07D4 /* memory.h */,
0269543714317AC8003A07D4 /* monitor.c */,
0269543814317AC8003A07D4 /* monitor.h */,
0269543C14317B11003A07D4 /* mzpokeysnd.c */,
0269543D14317B11003A07D4 /* mzpokeysnd.h */,
026954061431770E003A07D4 /* sio.c */,
026954071431770E003A07D4 /* sio.h */,
02E763AF143194CF008050EA /* statesav.c */,
02E763B0143194CF008050EA /* statesav.h */,
026953FD143176E6003A07D4 /* pbi.c */,
026953FE143176E6003A07D4 /* pbi.h */,
0269543414317AAF003A07D4 /* pbi_scsi.c */,
0269543514317AAF003A07D4 /* pbi_scsi.h */,
0269543114317A76003A07D4 /* pbi_bb.c */,
0269543214317A76003A07D4 /* pbi_bb.h */,
0269542E14317A63003A07D4 /* pbi_mio.c */,
0269542F14317A63003A07D4 /* pbi_mio.h */,
0269542814317A43003A07D4 /* pia.c */,
0269543514317AAF003A07D4 /* pbi_scsi.h */,
026953FE143176E6003A07D4 /* pbi.h */,
0269542914317A43003A07D4 /* pia.h */,
02695400143176F4003A07D4 /* pokey.c */,
02695401143176F4003A07D4 /* pokey.h */,
02695402143176F4003A07D4 /* pokeysnd.c */,
02695403143176F4003A07D4 /* pokeysnd.h */,
0269544214317B42003A07D4 /* remez.c */,
0269544314317B42003A07D4 /* remez.h */,
0269540C1431775C003A07D4 /* sndsave.c */,
0269540D1431775C003A07D4 /* sndsave.h */,
02695449143184CD003A07D4 /* screen.c */,
02695410143177DF003A07D4 /* rtime.h */,
0269544A143184CD003A07D4 /* screen.h */,
02669C741435806A0002A11B /* sound_oss.c */,
9491E45A1989AF050075135C /* sound.c */,
026954071431770E003A07D4 /* sio.h */,
0269540D1431775C003A07D4 /* sndsave.h */,
02669C751435806A0002A11B /* sound.h */,
0269540F143177DF003A07D4 /* rtime.c */,
02695410143177DF003A07D4 /* rtime.h */,
02E763C014319545008050EA /* ui_basic.c */,
02E763B0143194CF008050EA /* statesav.h */,
94DEA00C1719186F00073397 /* sysrom.h */,
02E763C114319545008050EA /* ui_basic.h */,
02E763C214319545008050EA /* ui.c */,
02E763C314319545008050EA /* ui.h */,
026954091431771D003A07D4 /* util.c */,
0269540A1431771D003A07D4 /* util.h */,
9491E464198C11A10075135C /* act */,
);
name = atari800;
sourceTree = "<group>";
Expand Down
1 change: 1 addition & 0 deletions Cores/Atari800/PVAtari800/Core.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<key>PVSupportedSystems</key>
<array>
<string>com.provenance.5200</string>
<string>com.provenance.8bit</string>
</array>
<key>PVProjectName</key>
<string>Atari 800</string>
Expand Down
16 changes: 7 additions & 9 deletions Cores/Gambatte/GB/CoreOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extension PVGBEmulatorCore: CoreOptional {
public static var options: [CoreOption] = {
var options = [CoreOption]()

let videoGroup = CoreOption.group(display: CoreOptionValueDisplay(title: "Video",
let videoGroup = CoreOption.group(.init(title: "Video",
description: "Change the way Gambatte renders games."),
subOptions: [paletteOption])

Expand All @@ -60,14 +60,12 @@ extension PVGBEmulatorCore: CoreOptional {
"GameBoy Color - Grayscale"
])

static var paletteOption: CoreOption = {
let palletteOption = CoreOption.multi(display:
CoreOptionValueDisplay(
title: "GameBoy (non color) Palette",
description: "The drawing palette to use"),
values: paletteValues)
return palletteOption
}()
static var paletteOption: CoreOption = {
.multi(.init(
title: "GameBoy (non color) Palette",
description: "The drawing palette to use"),
values: paletteValues)
}()
}

@objc extension PVGBEmulatorCore {
Expand Down
12 changes: 5 additions & 7 deletions Cores/Mednafen/MednafenGameCore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ extension MednafenGameCore: CoreOptional {
public static var options: [CoreOption] = {
var options = [CoreOption]()

let fastGroup = CoreOption.group(display: CoreOptionValueDisplay(title: "Fast Cores",
description: "Alternative versions of cores that trade accuracy for speed"),
subOptions: [pceFastOption, snesFastOption])
let fastGroup:CoreOption = .group(.init(title: "Fast Cores",
description: "Alternative versions of cores that trade accuracy for speed"),
subOptions: [pceFastOption, snesFastOption])


options.append(fastGroup)
Expand All @@ -92,20 +92,18 @@ extension MednafenGameCore: CoreOptional {


static var pceFastOption: CoreOption = {
let pceFastOption = CoreOption.bool(display: .init(
.bool(.init(
title: "PCE Fast",
description: "Use a faster but possibly buggy PCEngine version.",
requiresRestart: true),
defaultValue: false)
return pceFastOption
}()

static var snesFastOption: CoreOption = {
let snesFastOption = CoreOption.bool(display: .init(
.bool(.init(
title: "SNES Fast",
description: "Use faster but maybe more buggy SNES core (default)",
requiresRestart: true), defaultValue: true)
return snesFastOption
}()
}

Expand Down
5 changes: 5 additions & 0 deletions Cores/Mupen64Plus/Compatibility/SDL/SDLStubs.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ Uint32 SDL_GetTicks(void)
return MupenOEMonotonicTime();
}

void SDL_WasInit(UInt32 flags)
{
NSLog(@"SDL_WasInit: %i", flags);
}

void SDL_Quit(void)
{
}
Expand Down
Loading