mirror of https://github.com/PCSX2/pcsx2.git
All right, this version of GSnull doesn't assert, and if you finagle enough with LilyPad's settings, you can get the keyboard to work (but not a gamepad). Occasionally causes the pad plugin to close on starting emulation.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1160 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
f4c3560c75
commit
e10ca2ba49
|
@ -31,6 +31,9 @@ using namespace std;
|
|||
Display *display;
|
||||
int screen;
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
HINSTANCE HInst;
|
||||
#endif
|
||||
|
||||
const unsigned char version = PS2E_GS_VERSION;
|
||||
const unsigned char revision = 0;
|
||||
|
@ -125,7 +128,7 @@ EXPORT_C_(s32) GSopen(void *pDsp, char *Title, int multithread)
|
|||
#ifdef GS_LOG
|
||||
GS_LOG("GS open\n");
|
||||
#endif
|
||||
assert( GSirq != NULL );
|
||||
//assert( GSirq != NULL );
|
||||
|
||||
#ifdef __LINUX__
|
||||
display = XOpenDisplay(0);
|
||||
|
@ -133,8 +136,8 @@ EXPORT_C_(s32) GSopen(void *pDsp, char *Title, int multithread)
|
|||
|
||||
if( pDsp != NULL ) *(Display**)pDsp = display;
|
||||
#else
|
||||
// Haven't implemented anything for Windows yet.
|
||||
pDsp = NULL;
|
||||
if( pDsp != NULL ) *(int*)pDsp = (int)GetNextWindow(GetForegroundWindow(),GW_HWNDNEXT);
|
||||
(NULL);
|
||||
#endif
|
||||
SysPrintf("Opening GSnull\n");
|
||||
return 0;
|
||||
|
|
|
@ -63,7 +63,6 @@ typedef struct
|
|||
int Log;
|
||||
} Config;
|
||||
|
||||
|
||||
extern Config conf;
|
||||
extern FILE *gsLog;
|
||||
|
||||
|
|
Loading…
Reference in New Issue