From 11390351acfa65f030c65ae9c881b15213d3c9b6 Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Sun, 8 Jun 2008 13:27:17 +0000 Subject: [PATCH] fixed SDL build issues --- src/drivers/sdl/sdl-video.cpp | 12 ++++++++++-- src/drivers/sdl/sdl-video.h | 1 + src/drivers/win/video.cpp | 5 ----- src/video.cpp | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/drivers/sdl/sdl-video.cpp b/src/drivers/sdl/sdl-video.cpp index c94cf677..4cd0b071 100644 --- a/src/drivers/sdl/sdl-video.cpp +++ b/src/drivers/sdl/sdl-video.cpp @@ -33,7 +33,8 @@ #include "sdl-icon.h" #include "dface.h" -#include "../common/configSys.h" +#include "../common/configSys.h" +#include "sdl-video.h" // GLOBALS extern Config *g_config; @@ -65,7 +66,14 @@ static int s_paletterefresh; /** * Attempts to destroy the graphical video display. Returns 0 on * success, -1 on failure. - */ + */ + +//draw input aids if we are fullscreen +bool FCEUD_ShouldDrawInputAids() +{ + return s_fullscreen!=0; +} + int KillVideo() { diff --git a/src/drivers/sdl/sdl-video.h b/src/drivers/sdl/sdl-video.h index 4a4f056d..002f4c8b 100644 --- a/src/drivers/sdl/sdl-video.h +++ b/src/drivers/sdl/sdl-video.h @@ -1 +1,2 @@ uint32 PtoV(uint16 x, uint16 y); +bool FCEUD_ShouldDrawInputAids(); diff --git a/src/drivers/win/video.cpp b/src/drivers/win/video.cpp index 829192a3..ecdc5e78 100644 --- a/src/drivers/win/video.cpp +++ b/src/drivers/win/video.cpp @@ -424,11 +424,6 @@ int SetVideoMode(int fs) return 1; } -//draw input aids if we are fullscreen -bool FCEUD_ShouldDrawInputAids() -{ - return fullscreen!=0; -} static void BlitScreenWindow(uint8 *XBuf); static void BlitScreenFull(uint8 *XBuf); diff --git a/src/video.cpp b/src/video.cpp index 72889142..ed84760b 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -60,7 +60,7 @@ extern uint32 cur_input_display; #ifdef _USE_SHARED_MEMORY_ HANDLE mapXBuf; #endif - + void FCEU_KillVirtualVideo(void) { //mbg merge TODO 7/17/06 temporarily removed