Merge branch 'release/1.0.13'

RetroAchievements · Oct 17, 2018 · 61963fb · 61963fb
2 parents 9dd7d62 + 201a167
commit 61963fb
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 7 deletions.
diff --git a/dl-cores.bat b/dl-cores.bat
@@ -12,7 +12,7 @@ FOR %%A IN (%1 %2 %3) DO (
 )
 
 SET SUPPORTED_CORES=fbalpha fceumm gambatte genesis_plus_gx handy mednafen_ngp ^
-mednafen_supergrafx mednafen_vb mgba picodrive snes9x stella
+mednafen_supergrafx mednafen_vb mgba picodrive snes9x stella prosystem
 SET NIGHTLY_URL="https://buildbot.libretro.com/nightly/windows/x86/latest"
 SET DEST_DIR=bin\Cores
 SET DEPS=wget unzip

diff --git a/dl-cores.sh b/dl-cores.sh
@@ -12,6 +12,7 @@
 SUPPORTED_CORES=(
     fbalpha fceumm gambatte genesis_plus_gx handy mednafen_ngp
     mednafen_supergrafx mednafen_vb mgba picodrive snes9x stella
+    prosystem
 )
 NIGHTLY_URL="https://buildbot.libretro.com/nightly/windows/x86/latest"
 DEST_DIR="bin/Cores"

diff --git a/src/Application.cpp b/src/Application.cpp
@@ -743,6 +743,7 @@ bool Application::loadGame(const std::string& path)
   case Emulator::kMednafenPsx:
   case Emulator::kMednafenNgp:
   case Emulator::kFBAlpha:
+  case Emulator::kProSystem:
     data = _core.getMemoryData(RETRO_MEMORY_SYSTEM_RAM);
     size = _core.getMemorySize(RETRO_MEMORY_SYSTEM_RAM);
     registerMemoryRegion(&numBanks, 0, data, size);
@@ -1596,12 +1597,13 @@ void Application::handle(const SDL_SysWMEvent* syswm)
     case IDM_SYSTEM_MEDNAFENNGP:
     case IDM_SYSTEM_MEDNAFENVB:
     case IDM_SYSTEM_FBALPHA:
+    case IDM_SYSTEM_PROSYSTEM:
       {
         static Emulator emulators[] =
         {
           Emulator::kStella, Emulator::kSnes9x, Emulator::kPicoDrive, Emulator::kGenesisPlusGx, Emulator::kFceumm,
           Emulator::kHandy, Emulator::kBeetleSgx, Emulator::kGambatte, Emulator::kMGBA, Emulator::kMednafenPsx,
-          Emulator::kMednafenNgp, Emulator::kMednafenVb, Emulator::kFBAlpha
+          Emulator::kMednafenNgp, Emulator::kMednafenVb, Emulator::kFBAlpha, Emulator::kProSystem
         };
 
         _fsm.loadCore(emulators[cmd - IDM_SYSTEM_STELLA]);

diff --git a/src/Emulator.cpp b/src/Emulator.cpp
@@ -37,6 +37,7 @@ const char* getEmulatorName(Emulator emulator)
   case Emulator::kMednafenNgp:   return "Mednafen NGP";
   case Emulator::kMednafenVb:    return "Mednafen VB";
   case Emulator::kFBAlpha:       return "Final Burn Alpha";
+  case Emulator::kProSystem:     return "ProSystem";
   default:                       break;
   }
 
@@ -61,6 +62,7 @@ const char* getEmulatorFileName(Emulator emulator)
   case Emulator::kMednafenNgp:   return "mednafen_ngp_libretro";
   case Emulator::kMednafenVb:    return "mednafen_vb_libretro";
   case Emulator::kFBAlpha:       return "fbalpha_libretro";
+  case Emulator::kProSystem:     return "prosystem_libretro";
   default:                       break;
   }
 
@@ -87,6 +89,7 @@ const char* getEmulatorExtensions(Emulator emulator)
   case Emulator::kMednafenNgp:   return EXTPREFIX "*.NGP;*.NGC;*.NGPC\0";                     // ngp|ngc|ngpc
   case Emulator::kMednafenVb:    return EXTPREFIX "*.VB;*.VBOY;*.BIN\0";                      // vb|vboy|bin
   case Emulator::kFBAlpha:       return EXTPREFIX "*.ZIP\0";                                  // iso|zip|7z
+  case Emulator::kProSystem:     return EXTPREFIX "*.A78\0";                                  // a78
   default:                       break;
   }
 
@@ -114,6 +117,7 @@ const char* getSystemName(System system)
   case System::kVirtualBoy:     return "Virtual Boy";
   case System::kGameGear:       return "Game Gear";
   case System::kArcade:         return "Arcade";
+  case System::kAtari7800:      return "Atari 7800";
   default:                      break;
   }
 
@@ -134,6 +138,7 @@ System getSystem(Emulator emulator, const std::string game_path, libretro::Core*
   case Emulator::kMednafenNgp: return System::kNeoGeoPocket;
   case Emulator::kMednafenVb:  return System::kVirtualBoy;
   case Emulator::kFBAlpha:     return System::kArcade;
+  case Emulator::kProSystem:   return System::kAtari7800;
 
   case Emulator::kPicoDrive:
   case Emulator::kGenesisPlusGx:
@@ -291,8 +296,11 @@ bool romLoaded(Logger* logger, System system, const std::string& path, void* rom
   case System::kMasterSystem:
   case System::kMegaDrive:
   case System::kSuperNintendo:
+  case System::kAtari7800:
   default:
+    rom = util::loadFile(logger, path, &size);
     RA_OnLoadNewRom((BYTE*)rom, size);
+    free(rom);
     ok = true;
     break;
 
@@ -302,14 +310,18 @@ bool romLoaded(Logger* logger, System system, const std::string& path, void* rom
     if (!ok)
     {
       // Fall back to the default strategy, assuming FDS file
+      rom = util::loadFile(logger, path, &size);
       RA_OnLoadNewRom((BYTE*)rom, size);
+      free(rom);
       ok = true;
     }
 
     break;
 
   case System::kAtariLynx:
+    rom = util::loadFile(logger, path, &size);
     RA_OnLoadNewRom((BYTE*)rom + 0x0040, size > 0x0240 ? 0x0200 : size - 0x0040);
+    free(rom);
     ok = true;
     break;
 

diff --git a/src/Emulator.h b/src/Emulator.h
@@ -42,7 +42,8 @@ enum class Emulator
   kMednafenPsx,
   kMednafenNgp,
   kMednafenVb,
-  kFBAlpha
+  kFBAlpha,
+  kProSystem
 };
 
 enum class System
@@ -62,7 +63,8 @@ enum class System
   kNeoGeoPocket   = NeoGeoPocket,
   kVirtualBoy     = VirtualBoy,
   kGameGear       = GameGear,
-  kArcade         = Arcade
+  kArcade         = Arcade,
+  kAtari7800      = Atari7800
 };
 
 const char* getEmulatorName(Emulator emulator);

diff --git a/src/RALibretro.vcxproj b/src/RALibretro.vcxproj
@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>LOG_TO_FILE;WIN32;_DEBUG;_WINDOWS;OUTSIDE_SPEEX;RANDOM_PREFIX=speex;_USE_SSE2;FIXED_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>LOG_TO_FILE;WIN32;NDEBUG;_WINDOWS;OUTSIDE_SPEEX;RANDOM_PREFIX=speex;_USE_SSE2;FIXED_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)SDL2\include;$(ProjectDir)miniz;$(ProjectDir)RA_Integration\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

diff --git a/src/menu.rc b/src/menu.rc
@@ -46,12 +46,13 @@ main MENU
             MENUITEM "Genesis Plus GX (Game Gear, Master System, Mega Drive)", IDM_SYSTEM_GENESISPLUSGX
             MENUITEM "Handy (Atari Lynx)", IDM_SYSTEM_HANDY
             MENUITEM "Mednafen NGP (Neo Geo Pocket)", IDM_SYSTEM_MEDNAFENNGP
-            MENUITEM "Mednafen PSX (PlayStation)", IDM_SYSTEM_MEDNAFENPSX
+            //MENUITEM "Mednafen PSX (PlayStation)", IDM_SYSTEM_MEDNAFENPSX
             MENUITEM "Mednafen VB (Virtual Boy)", IDM_SYSTEM_MEDNAFENVB
             MENUITEM "mGBA (Game Boy Advance)", IDM_SYSTEM_MGBA
             MENUITEM "PicoDrive (Master System, Mega Drive)", IDM_SYSTEM_PICODRIVE
             MENUITEM "Snes9x (Super Nintendo)", IDM_SYSTEM_SNES9X
             MENUITEM "Stella (Atari 2600)", IDM_SYSTEM_STELLA
+            MENUITEM "ProSystem (Atari 7800)", IDM_SYSTEM_PROSYSTEM
         }
         MENUITEM SEPARATOR
         MENUITEM "Load Game...", IDM_LOAD_GAME

diff --git a/src/resource.h b/src/resource.h
@@ -35,6 +35,7 @@ along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
 #define IDM_SYSTEM_MEDNAFENNGP                  50010
 #define IDM_SYSTEM_MEDNAFENVB                   50011
 #define IDM_SYSTEM_FBALPHA                      50012
+#define IDM_SYSTEM_PROSYSTEM                    50013
 
 // Keep those in increasing order
 #define IDM_SAVE_STATE_1                        51000