ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the changes from r1593 to Linux. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1594 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-08-02 07:21:17 +00:00
parent 4bb4bebd46
commit 3d87e4845a
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/Linux/LnxMain.cpp
View File

@ -17,7 +17,6 @@
*/ */
#include "LnxMain.h" #include "LnxMain.h"
#include "CDVD/CDVDisoReader.h"
using namespace R5900; using namespace R5900;

3
pcsx2/Linux/LnxMain.h
View File

@ -23,6 +23,9 @@
#include "LnxMain.h" #include "LnxMain.h"
#include "HostGui.h" #include "HostGui.h"
// For Linux ISO loading
#include "CDVD/CDVDisoReader.h"
extern bool applychanges; extern bool applychanges;
extern bool Slots[5]; extern bool Slots[5];

14
pcsx2/Linux/LnxSysExec.cpp
View File

@ -183,16 +183,26 @@ void RunGui()
{ {
// Initially bypass GUI and start PCSX2 directly. // Initially bypass GUI and start PCSX2 directly.
// Manually load plugins using the user's configured image (if non-elf). // Manually load plugins using the user's configured image (if non-elf).
int mode = g_Startup.BootMode & BootMode_ModeMask;
if( g_Startup.Enabled && (g_Startup.BootMode != BootMode_Elf) ) if( g_Startup.Enabled && (mode != BootMode_Elf) )
{ {
if(mode == BootMode_Iso)
CDVD = ISO;
else if(mode == BootMode_NoDisc)
CDVD = NODISC;
else
CDVD = CDVD_plugin;
if (OpenPlugins(g_Startup.ImageName) == -1) if (OpenPlugins(g_Startup.ImageName) == -1)
return; return;
} }
SysPrepareExecution( SysPrepareExecution(
(g_Startup.BootMode == BootMode_Elf) ? g_Startup.ImageName : NULL, (g_Startup.BootMode == BootMode_Elf) ? g_Startup.ImageName : NULL,
(g_Startup.BootMode == BootMode_Bios) ((g_Startup.BootMode & BootMode_Bios) != 0)
); );
} }

3
pcsx2/Linux/LnxSysExec.h
View File

@ -24,6 +24,9 @@
#include <sys/mman.h> #include <sys/mman.h>
#include "x86/iR5900.h" #include "x86/iR5900.h"
// For Linux ISO loading
#include "CDVD/CDVDisoReader.h"
void SysPageFaultExceptionFilter( int signal, siginfo_t *info, void * ); void SysPageFaultExceptionFilter( int signal, siginfo_t *info, void * );
void __fastcall InstallLinuxExceptionHandler(); void __fastcall InstallLinuxExceptionHandler();
void __fastcall ReleaseLinuxExceptionHandler(); void __fastcall ReleaseLinuxExceptionHandler();