Skip to content

Commit 61963fb

Browse files
meleumeleu
committed
Merge branch 'release/1.0.13'
2 parents 9dd7d62 + 201a167 commit 61963fb

File tree

8 files changed

+26
-7
lines changed

8 files changed

+26
-7
lines changed

‎dl-cores.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FOR %%A IN (%1 %2 %3) DO (
1212
)
1313

1414
SET SUPPORTED_CORES=fbalpha fceumm gambatte genesis_plus_gx handy mednafen_ngp ^
15-
mednafen_supergrafx mednafen_vb mgba picodrive snes9x stella
15+
mednafen_supergrafx mednafen_vb mgba picodrive snes9x stella prosystem
1616
SET NIGHTLY_URL="https://buildbot.libretro.com/nightly/windows/x86/latest"
1717
SET DEST_DIR=bin\Cores
1818
SET DEPS=wget unzip

‎dl-cores.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
SUPPORTED_CORES=(
1313
fbalpha fceumm gambatte genesis_plus_gx handy mednafen_ngp
1414
mednafen_supergrafx mednafen_vb mgba picodrive snes9x stella
15+
prosystem
1516
)
1617
NIGHTLY_URL="https://buildbot.libretro.com/nightly/windows/x86/latest"
1718
DEST_DIR="bin/Cores"

‎src/Application.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,7 @@ bool Application::loadGame(const std::string& path)
743743
case Emulator::kMednafenPsx:
744744
case Emulator::kMednafenNgp:
745745
case Emulator::kFBAlpha:
746+
case Emulator::kProSystem:
746747
data = _core.getMemoryData(RETRO_MEMORY_SYSTEM_RAM);
747748
size = _core.getMemorySize(RETRO_MEMORY_SYSTEM_RAM);
748749
registerMemoryRegion(&numBanks, 0, data, size);
@@ -1596,12 +1597,13 @@ void Application::handle(const SDL_SysWMEvent* syswm)
15961597
case IDM_SYSTEM_MEDNAFENNGP:
15971598
case IDM_SYSTEM_MEDNAFENVB:
15981599
case IDM_SYSTEM_FBALPHA:
1600+
case IDM_SYSTEM_PROSYSTEM:
15991601
{
16001602
static Emulator emulators[] =
16011603
{
16021604
Emulator::kStella, Emulator::kSnes9x, Emulator::kPicoDrive, Emulator::kGenesisPlusGx, Emulator::kFceumm,
16031605
Emulator::kHandy, Emulator::kBeetleSgx, Emulator::kGambatte, Emulator::kMGBA, Emulator::kMednafenPsx,
1604-
Emulator::kMednafenNgp, Emulator::kMednafenVb, Emulator::kFBAlpha
1606+
Emulator::kMednafenNgp, Emulator::kMednafenVb, Emulator::kFBAlpha, Emulator::kProSystem
16051607
};
16061608

16071609
_fsm.loadCore(emulators[cmd - IDM_SYSTEM_STELLA]);

‎src/Emulator.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const char* getEmulatorName(Emulator emulator)
3737
case Emulator::kMednafenNgp: return "Mednafen NGP";
3838
case Emulator::kMednafenVb: return "Mednafen VB";
3939
case Emulator::kFBAlpha: return "Final Burn Alpha";
40+
case Emulator::kProSystem: return "ProSystem";
4041
default: break;
4142
}
4243

@@ -61,6 +62,7 @@ const char* getEmulatorFileName(Emulator emulator)
6162
case Emulator::kMednafenNgp: return "mednafen_ngp_libretro";
6263
case Emulator::kMednafenVb: return "mednafen_vb_libretro";
6364
case Emulator::kFBAlpha: return "fbalpha_libretro";
65+
case Emulator::kProSystem: return "prosystem_libretro";
6466
default: break;
6567
}
6668

@@ -87,6 +89,7 @@ const char* getEmulatorExtensions(Emulator emulator)
8789
case Emulator::kMednafenNgp: return EXTPREFIX "*.NGP;*.NGC;*.NGPC\0"; // ngp|ngc|ngpc
8890
case Emulator::kMednafenVb: return EXTPREFIX "*.VB;*.VBOY;*.BIN\0"; // vb|vboy|bin
8991
case Emulator::kFBAlpha: return EXTPREFIX "*.ZIP\0"; // iso|zip|7z
92+
case Emulator::kProSystem: return EXTPREFIX "*.A78\0"; // a78
9093
default: break;
9194
}
9295

@@ -114,6 +117,7 @@ const char* getSystemName(System system)
114117
case System::kVirtualBoy: return "Virtual Boy";
115118
case System::kGameGear: return "Game Gear";
116119
case System::kArcade: return "Arcade";
120+
case System::kAtari7800: return "Atari 7800";
117121
default: break;
118122
}
119123

@@ -134,6 +138,7 @@ System getSystem(Emulator emulator, const std::string game_path, libretro::Core*
134138
case Emulator::kMednafenNgp: return System::kNeoGeoPocket;
135139
case Emulator::kMednafenVb: return System::kVirtualBoy;
136140
case Emulator::kFBAlpha: return System::kArcade;
141+
case Emulator::kProSystem: return System::kAtari7800;
137142

138143
case Emulator::kPicoDrive:
139144
case Emulator::kGenesisPlusGx:
@@ -291,8 +296,11 @@ bool romLoaded(Logger* logger, System system, const std::string& path, void* rom
291296
case System::kMasterSystem:
292297
case System::kMegaDrive:
293298
case System::kSuperNintendo:
299+
case System::kAtari7800:
294300
default:
301+
rom = util::loadFile(logger, path, &size);
295302
RA_OnLoadNewRom((BYTE*)rom, size);
303+
free(rom);
296304
ok = true;
297305
break;
298306

@@ -302,14 +310,18 @@ bool romLoaded(Logger* logger, System system, const std::string& path, void* rom
302310
if (!ok)
303311
{
304312
// Fall back to the default strategy, assuming FDS file
313+
rom = util::loadFile(logger, path, &size);
305314
RA_OnLoadNewRom((BYTE*)rom, size);
315+
free(rom);
306316
ok = true;
307317
}
308318

309319
break;
310320

311321
case System::kAtariLynx:
322+
rom = util::loadFile(logger, path, &size);
312323
RA_OnLoadNewRom((BYTE*)rom + 0x0040, size > 0x0240 ? 0x0200 : size - 0x0040);
324+
free(rom);
313325
ok = true;
314326
break;
315327

‎src/Emulator.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ enum class Emulator
4242
kMednafenPsx,
4343
kMednafenNgp,
4444
kMednafenVb,
45-
kFBAlpha
45+
kFBAlpha,
46+
kProSystem
4647
};
4748

4849
enum class System
@@ -62,7 +63,8 @@ enum class System
6263
kNeoGeoPocket = NeoGeoPocket,
6364
kVirtualBoy = VirtualBoy,
6465
kGameGear = GameGear,
65-
kArcade = Arcade
66+
kArcade = Arcade,
67+
kAtari7800 = Atari7800
6668
};
6769

6870
const char* getEmulatorName(Emulator emulator);

‎src/RALibretro.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6969
<ClCompile>
7070
<PreprocessorDefinitions>LOG_TO_FILE;WIN32;_DEBUG;_WINDOWS;OUTSIDE_SPEEX;RANDOM_PREFIX=speex;_USE_SSE2;FIXED_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
71-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
71+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
7272
<WarningLevel>Level3</WarningLevel>
7373
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
7474
<Optimization>Disabled</Optimization>
@@ -93,7 +93,7 @@
9393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9494
<ClCompile>
9595
<PreprocessorDefinitions>LOG_TO_FILE;WIN32;NDEBUG;_WINDOWS;OUTSIDE_SPEEX;RANDOM_PREFIX=speex;_USE_SSE2;FIXED_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
96-
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
96+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
9797
<WarningLevel>Level3</WarningLevel>
9898
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
9999
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)SDL2\include;$(ProjectDir)miniz;$(ProjectDir)RA_Integration\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

‎src/menu.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,13 @@ main MENU
4646
MENUITEM "Genesis Plus GX (Game Gear, Master System, Mega Drive)", IDM_SYSTEM_GENESISPLUSGX
4747
MENUITEM "Handy (Atari Lynx)", IDM_SYSTEM_HANDY
4848
MENUITEM "Mednafen NGP (Neo Geo Pocket)", IDM_SYSTEM_MEDNAFENNGP
49-
MENUITEM "Mednafen PSX (PlayStation)", IDM_SYSTEM_MEDNAFENPSX
49+
//MENUITEM "Mednafen PSX (PlayStation)", IDM_SYSTEM_MEDNAFENPSX
5050
MENUITEM "Mednafen VB (Virtual Boy)", IDM_SYSTEM_MEDNAFENVB
5151
MENUITEM "mGBA (Game Boy Advance)", IDM_SYSTEM_MGBA
5252
MENUITEM "PicoDrive (Master System, Mega Drive)", IDM_SYSTEM_PICODRIVE
5353
MENUITEM "Snes9x (Super Nintendo)", IDM_SYSTEM_SNES9X
5454
MENUITEM "Stella (Atari 2600)", IDM_SYSTEM_STELLA
55+
MENUITEM "ProSystem (Atari 7800)", IDM_SYSTEM_PROSYSTEM
5556
}
5657
MENUITEM SEPARATOR
5758
MENUITEM "Load Game...", IDM_LOAD_GAME

‎src/resource.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ along with Foobar. If not, see <http://www.gnu.org/licenses/>.
3535
#define IDM_SYSTEM_MEDNAFENNGP 50010
3636
#define IDM_SYSTEM_MEDNAFENVB 50011
3737
#define IDM_SYSTEM_FBALPHA 50012
38+
#define IDM_SYSTEM_PROSYSTEM 50013
3839

3940
// Keep those in increasing order
4041
#define IDM_SAVE_STATE_1 51000

0 commit comments

Comments
 (0)