fixed SDL build issues
This commit is contained in:
parent
70de69eacf
commit
11390351ac
|
@ -33,7 +33,8 @@
|
||||||
#include "sdl-icon.h"
|
#include "sdl-icon.h"
|
||||||
#include "dface.h"
|
#include "dface.h"
|
||||||
|
|
||||||
#include "../common/configSys.h"
|
#include "../common/configSys.h"
|
||||||
|
#include "sdl-video.h"
|
||||||
|
|
||||||
// GLOBALS
|
// GLOBALS
|
||||||
extern Config *g_config;
|
extern Config *g_config;
|
||||||
|
@ -65,7 +66,14 @@ static int s_paletterefresh;
|
||||||
/**
|
/**
|
||||||
* Attempts to destroy the graphical video display. Returns 0 on
|
* Attempts to destroy the graphical video display. Returns 0 on
|
||||||
* success, -1 on failure.
|
* success, -1 on failure.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
//draw input aids if we are fullscreen
|
||||||
|
bool FCEUD_ShouldDrawInputAids()
|
||||||
|
{
|
||||||
|
return s_fullscreen!=0;
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
KillVideo()
|
KillVideo()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
uint32 PtoV(uint16 x, uint16 y);
|
uint32 PtoV(uint16 x, uint16 y);
|
||||||
|
bool FCEUD_ShouldDrawInputAids();
|
||||||
|
|
|
@ -424,11 +424,6 @@ int SetVideoMode(int fs)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//draw input aids if we are fullscreen
|
|
||||||
bool FCEUD_ShouldDrawInputAids()
|
|
||||||
{
|
|
||||||
return fullscreen!=0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void BlitScreenWindow(uint8 *XBuf);
|
static void BlitScreenWindow(uint8 *XBuf);
|
||||||
static void BlitScreenFull(uint8 *XBuf);
|
static void BlitScreenFull(uint8 *XBuf);
|
||||||
|
|
|
@ -60,7 +60,7 @@ extern uint32 cur_input_display;
|
||||||
#ifdef _USE_SHARED_MEMORY_
|
#ifdef _USE_SHARED_MEMORY_
|
||||||
HANDLE mapXBuf;
|
HANDLE mapXBuf;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void FCEU_KillVirtualVideo(void)
|
void FCEU_KillVirtualVideo(void)
|
||||||
{
|
{
|
||||||
//mbg merge TODO 7/17/06 temporarily removed
|
//mbg merge TODO 7/17/06 temporarily removed
|
||||||
|
|
Loading…
Reference in New Issue