From f171bd3f722f3fc5ae7745ecfe9f711a5f7806d2 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 7 Jun 2010 16:26:41 +0000 Subject: [PATCH] Fix broken SDL build. Annoying have core & win32 files with the same name! --- src/drivers/win/video.h | 4 ---- src/drivers/win/window.cpp | 1 + src/video.h | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/win/video.h b/src/drivers/win/video.h index d599fcee..4b726b82 100644 --- a/src/drivers/win/video.h +++ b/src/drivers/win/video.h @@ -55,8 +55,4 @@ void FCEUD_BlitScreen(uint8 *XBuf); void ResetVideo(); void SetFSVideoMode(); void PushCurrentVideoSettings(); - -std::string FCEUI_GetSnapshotAsName(); -void FCEUI_SetSnapshotAsName(std::string name); - #endif diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index 53e897c0..ae58072c 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -25,6 +25,7 @@ #include "../../state.h" #include "../../cheat.h" //adelikat: For FCEU_LoadGameCheats() #include "../../version.h" +#include "../../video.h" //adelikat: For ScreenshotAs Get/Set functions #include "window.h" #include "main.h" #include "state.h" diff --git a/src/video.h b/src/video.h index 0418f603..a027cce4 100644 --- a/src/video.h +++ b/src/video.h @@ -26,3 +26,6 @@ extern struct GUIMESSAGE extern GUIMESSAGE subtitleMessage; void FCEU_DrawNumberRow(uint8 *XBuf, int *nstatus, int cur); + +std::string FCEUI_GetSnapshotAsName(); +void FCEUI_SetSnapshotAsName(std::string name); \ No newline at end of file