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

wxgui: A few Linux related changes. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1692 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-08-28 01:20:40 +00:00
parent f39c52f5d1
commit 282abf816d
7 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build/Utilities/Utilities.cbp
View File

@ -35,6 +35,8 @@
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=no --cflags`" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add directory="../../include" />
<Add directory="../../include/Utilities" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
@ -51,6 +53,8 @@
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add directory="../../include" />
<Add directory="../../include/Utilities" />
</Compiler> </Compiler>
</Target> </Target>
</Build> </Build>

1
pcsx2/Linux/pcsx2.cbp
View File

@ -109,6 +109,7 @@
<Unit filename="../../common/include/Pcsx2Config.h" /> <Unit filename="../../common/include/Pcsx2Config.h" />
<Unit filename="../../common/include/Pcsx2Defs.h" /> <Unit filename="../../common/include/Pcsx2Defs.h" />
<Unit filename="../../common/include/Pcsx2Types.h" /> <Unit filename="../../common/include/Pcsx2Types.h" />
<Unit filename="../../common/include/Utilities/Dependencies.h" />
<Unit filename="../../common/include/wx/folderdesc.txt" /> <Unit filename="../../common/include/wx/folderdesc.txt" />
<Unit filename="../../common/include/wx/scopedarray.h" /> <Unit filename="../../common/include/wx/scopedarray.h" />
<Unit filename="../../common/include/wx/scopedptr.h" /> <Unit filename="../../common/include/wx/scopedptr.h" />

1
pcsx2/NakedAsm.h
View File

@ -57,6 +57,7 @@ extern "C"
void JITCompile(); void JITCompile();
void JITCompileInBlock(); void JITCompileInBlock();
void DispatcherReg(); void DispatcherReg();
void DispatcherEvent();
} }
#endif #endif

2
pcsx2/gui/App.h
View File

@ -123,7 +123,7 @@ public:
bool PrepForExit(); bool PrepForExit();
void OnAssertFailure( const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg ); //void ( const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg );
const wxBitmap& GetLogoBitmap(); const wxBitmap& GetLogoBitmap();
wxImageList& GetImgList_Config(); wxImageList& GetImgList_Config();

1
pcsx2/ps2/CoreEmuThread.cpp
View File

@ -17,6 +17,7 @@
*/ */
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "Common.h"
#include "System.h" #include "System.h"
#include "SaveState.h" #include "SaveState.h"
#include "Elfheader.h" #include "Elfheader.h"

7
pcsx2/x86/ix86-32/aR5900-32.S
View File

@ -17,6 +17,7 @@
.extern REGINFO .extern REGINFO
.extern RECLUT .extern RECLUT
.extern recRecompile .extern recRecompile
.extern recEventTest
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// The address for all cleared blocks. It recompiles the current pc and then // The address for all cleared blocks. It recompiles the current pc and then
@ -48,3 +49,9 @@ DispatcherReg:
shr eax, 16 shr eax, 16
mov ecx, dword ptr [RECLUT+eax*4] mov ecx, dword ptr [RECLUT+eax*4]
jmp dword ptr [ecx+ebx] jmp dword ptr [ecx+ebx]
.globl DispatcherEvent
DispatcherEvent:
call recEventTest
jmp DispatcherReg

10
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -535,12 +535,13 @@ static void recShutdown( void )
#pragma warning(disable:4731) // frame pointer register 'ebp' modified by inline assembly code #pragma warning(disable:4731) // frame pointer register 'ebp' modified by inline assembly code
#endif #endif
void recStep( void ) { void recStep( void )
{
} }
extern "C"
{
static void recEventTest() void recEventTest()
{ {
#ifdef PCSX2_DEVBUILD #ifdef PCSX2_DEVBUILD
// dont' remove this check unless doing an official release // dont' remove this check unless doing an official release
@ -559,6 +560,7 @@ static void recEventTest()
assert( !g_globalXMMSaved && !g_globalMMXSaved); assert( !g_globalXMMSaved && !g_globalMMXSaved);
#endif #endif
} }
}
//////////////////////////////////////////////////// ////////////////////////////////////////////////////