mirror of https://github.com/PCSX2/pcsx2.git
wxGui: Get Linux compiling again.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1716 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42
parent
980afabc30
commit
b0f454ef28
|
|
@ -16,6 +16,7 @@
|
|||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
|
|
@ -27,7 +28,7 @@
|
|||
#define btoi(b) ((b)/16*10 + (b)%16) /* BCD to u_char */
|
||||
#define itob(i) ((i)/10*16 + (i)%10) /* u_char to BCD */
|
||||
|
||||
static __forceinline s32 msf_to_lsn(u8 *Time)
|
||||
static __forceinline s32 msf_to_lsn(u8 *Time)
|
||||
{
|
||||
u32 lsn;
|
||||
|
||||
|
|
@ -46,7 +47,7 @@ static __forceinline s32 msf_to_lba(u8 m, u8 s, u8 f)
|
|||
return lsn;
|
||||
}
|
||||
|
||||
static __forceinline void lsn_to_msf(u8 *Time, s32 lsn)
|
||||
static __forceinline void lsn_to_msf(u8 *Time, s32 lsn)
|
||||
{
|
||||
lsn += 150;
|
||||
Time[2] = lsn / 4500; // minuten
|
||||
|
|
@ -136,10 +137,10 @@ struct cdvdStruct {
|
|||
struct CDVD_API
|
||||
{
|
||||
void (CALLBACK *close)();
|
||||
|
||||
|
||||
// Don't need init or shutdown. iso/nodisc have no init/shutdown and plugin's
|
||||
// is handled by the PluginManager.
|
||||
|
||||
|
||||
// Don't need plugin specific things like freeze, test, or other stuff here.
|
||||
// Those are handled by the plugin manager specifically.
|
||||
|
||||
|
|
@ -175,23 +176,6 @@ extern void cdvdNewDiskCB();
|
|||
extern u8 cdvdRead(u8 key);
|
||||
extern void cdvdWrite(u8 key, u8 rt);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Multiple interface system for CDVD
|
||||
// used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Multiple interface system for CDVD
|
||||
// used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
enum CDVD_SourceType
|
||||
{
|
||||
CDVDsrc_Iso = 0, // use built in ISO api
|
||||
CDVDsrc_Plugin, // use external plugin
|
||||
CDVDsrc_NoDisc, // use built in CDVDnull
|
||||
};
|
||||
|
||||
extern void CDVDsys_ChangeSource( CDVD_SourceType type );
|
||||
extern CDVD_API* CDVD; // currently active CDVD access mode api (either Iso, NoDisc, or Plugin)
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ extern void DoCDVDclose();
|
|||
extern s32 DoCDVDreadSector(u8* buffer, u32 lsn, int mode);
|
||||
extern s32 DoCDVDreadTrack(u32 lsn, int mode);
|
||||
extern s32 DoCDVDgetBuffer(u8* buffer);
|
||||
extern s32 DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
|
||||
//extern s32 DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
|
||||
extern void DoCDVDnewDiskCB(void (*callback)());
|
||||
extern s32 DoCDVDdetectDiskType();
|
||||
extern void DoCDVDresetDiskTypeCache();
|
||||
|
|
|
|||
|
|
@ -117,11 +117,8 @@
|
|||
<Unit filename="../CDVD/CDVD_internal.h" />
|
||||
<Unit filename="../CDVD/CDVDaccess.cpp" />
|
||||
<Unit filename="../CDVD/CDVDaccess.h" />
|
||||
<Unit filename="../CDVD/CDVDiso.h" />
|
||||
<Unit filename="../CDVD/CDVDisoReader.cpp" />
|
||||
<Unit filename="../CDVD/CDVDisoReader.h" />
|
||||
<Unit filename="../CDVD/CDVDisodrv.h" />
|
||||
<Unit filename="../CDVD/CDVDlib.h" />
|
||||
<Unit filename="../CDVD/CdRom.cpp" />
|
||||
<Unit filename="../CDVD/CdRom.h" />
|
||||
<Unit filename="../CDVD/IsoFScdvd.h" />
|
||||
|
|
@ -216,7 +213,7 @@
|
|||
<Unit filename="../PathUtils.cpp" />
|
||||
<Unit filename="../Paths.h" />
|
||||
<Unit filename="../Pcsx2Config.cpp" />
|
||||
<Unit filename="../Plugins.cpp" />
|
||||
<Unit filename="../PluginManager.cpp" />
|
||||
<Unit filename="../Plugins.h" />
|
||||
<Unit filename="../PrecompiledHeader.h" />
|
||||
<Unit filename="../R3000A.cpp" />
|
||||
|
|
@ -235,7 +232,6 @@
|
|||
<Unit filename="../SamplProf.h" />
|
||||
<Unit filename="../SaveState.cpp" />
|
||||
<Unit filename="../SaveState.h" />
|
||||
<Unit filename="../Saveslots.cpp" />
|
||||
<Unit filename="../Sif.cpp" />
|
||||
<Unit filename="../Sif.h" />
|
||||
<Unit filename="../Sifcmd.h" />
|
||||
|
|
@ -302,6 +298,7 @@
|
|||
<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
|
||||
<Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
|
||||
<Unit filename="../gui/Panels/VideoPanel.cpp" />
|
||||
<Unit filename="../gui/Plugins.cpp" />
|
||||
<Unit filename="../gui/Resources/AppIcon.h" />
|
||||
<Unit filename="../gui/Resources/BackgroundLogo.h" />
|
||||
<Unit filename="../gui/Resources/ConfigIcon_Cpu.h" />
|
||||
|
|
@ -312,6 +309,7 @@
|
|||
<Unit filename="../gui/Resources/ConfigIcon_Video.h" />
|
||||
<Unit filename="../gui/Resources/EmbeddedImage.h" />
|
||||
<Unit filename="../gui/Resources/ps2_silver.h" />
|
||||
<Unit filename="../gui/Saveslots.cpp" />
|
||||
<Unit filename="../gui/i18n.cpp" />
|
||||
<Unit filename="../gui/i18n.h" />
|
||||
<Unit filename="../gui/main.cpp" />
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ void SysDetect()
|
|||
L"\tx86Flags = %8.8x %8.8x\n"
|
||||
L"\tx86EFlags = %8.8x\n",
|
||||
wxString::FromAscii( x86caps.VendorName ).c_str(), x86caps.StepID,
|
||||
wxString::FromAscii( x86caps.FamilyName ).Trim().Trim(false).c_str(),
|
||||
wxString::FromAscii( x86caps.FamilyName ).Trim().Trim(false).c_str(),
|
||||
x86caps.Speed / 1000, x86caps.Speed%1000,
|
||||
x86caps.PhysicalCores, x86caps.LogicalCores,
|
||||
wxString::FromAscii( x86caps.TypeName ).c_str(),
|
||||
|
|
@ -134,7 +134,7 @@ bool SysAllocateMem()
|
|||
|
||||
// Failures on the core initialization of memory is bad, since it means the emulator is
|
||||
// completely non-functional.
|
||||
|
||||
|
||||
//Msgbox::Alert( "Failed to allocate memory needed to run pcsx2.\n\nError: %s", params ex.cMessage() );
|
||||
SysShutdownMem();
|
||||
return false;
|
||||
|
|
@ -166,7 +166,7 @@ void SysAllocateDynarecs()
|
|||
{
|
||||
// TODO : Fix this message. It should respond according to the user's
|
||||
// currently configured recompiler.interpreter options, for example.
|
||||
|
||||
|
||||
/*Msgbox::Alert(
|
||||
"The EE/IOP recompiler failed to initialize with the following error:\n\n"
|
||||
"%s"
|
||||
|
|
@ -215,7 +215,7 @@ void SysAllocateDynarecs()
|
|||
Msgbox::Alert(
|
||||
"The VU1 recompiler failed to initialize with the following error:\n\n"
|
||||
"%s"
|
||||
"\n\nThe VU1 interpreter will be used for this session (will slow down most games).", params
|
||||
"\n\nThe VU1 interpreter will be used for this session (will slow down most games).", params
|
||||
ex.cMessage()
|
||||
);
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -23,8 +23,18 @@
|
|||
#include "Utilities/Threading.h" // to use threading stuff, include the Threading namespace in your file.
|
||||
#include "Misc.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Multiple interface system for CDVD
|
||||
// used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
|
||||
// ---------------------------------------------------------------------------
|
||||
enum CDVD_SourceType
|
||||
{
|
||||
CDVDsrc_Iso = 0, // use built in ISO api
|
||||
CDVDsrc_Plugin, // use external plugin
|
||||
CDVDsrc_NoDisc, // use built in CDVDnull
|
||||
};
|
||||
|
||||
class CoreEmuThread;
|
||||
enum CDVD_SourceType;
|
||||
|
||||
extern bool SysInit();
|
||||
extern void SysDetect(); // Detects cpu type and fills cpuInfo structs.
|
||||
|
|
|
|||
|
|
@ -75,6 +75,8 @@ void CoreEmuThread::CpuInitializeMess()
|
|||
// of SEH, and so these functions can be inlined.
|
||||
#ifdef _WIN32
|
||||
# define __unique_stackframe __noinline
|
||||
#else
|
||||
# define __unique_stackframe
|
||||
#endif
|
||||
|
||||
// On Win32 this function invokes SEH, which requires it be in a function all by itself
|
||||
|
|
|
|||
Loading…
Reference in New Issue