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

Trying to untangle the horrible web of file dependencies

This commit is contained in:
rheiny 2007-02-11 13:13:36 +00:00
parent 1381b9fe37
commit a991ad19e4
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drivers/win/main.cpp
View File

@ -55,6 +55,7 @@
#include "config.h" #include "config.h"
#include "sound.h" #include "sound.h"
#include "wave.h" #include "wave.h"
#include "video.h"
//--------------------------- //---------------------------
//mbg merge 6/29/06 - new aboutbox //mbg merge 6/29/06 - new aboutbox
@ -113,7 +114,7 @@ int totallines = 0;
static int exiting = 0; static int exiting = 0;
static volatile int moocow = 0; static volatile int moocow = 0;
static int windowedfailed; int windowedfailed;
static volatile int _userpause = 0; //mbg merge 7/18/06 changed tasbuild was using this only in a couple of places static volatile int _userpause = 0; //mbg merge 7/18/06 changed tasbuild was using this only in a couple of places
@ -270,7 +271,7 @@ void FixFL()
totallines = erendline - srendline + 1; totallines = erendline - srendline + 1;
} }
static void UpdateRendBounds(void) void UpdateRendBounds()
{ {
FCEUI_SetRenderedLines(srendlinen, erendlinen, srendlinep, erendlinep); FCEUI_SetRenderedLines(srendlinen, erendlinen, srendlinep, erendlinep);
FixFL(); FixFL();
@ -369,10 +370,6 @@ void DoPriority()
} }
} }
// TODO: HORRIBLE
#include "video.cpp"
int DriverInitialize() int DriverInitialize()
{ {
if(soundo) if(soundo)

4
src/drivers/win/main.h
View File

@ -1,7 +1,7 @@
#ifndef WIN_MAIN_H #ifndef WIN_MAIN_H
#define WIN_MAIN_H #define WIN_MAIN_H
#include "../../types.h" #include "common.h"
// #defines // #defines
@ -87,6 +87,8 @@ extern int soundo;
extern int eoptions; extern int eoptions;
extern int soundoptions; extern int soundoptions;
extern uint8 *xbsave; extern uint8 *xbsave;
extern HRESULT ddrval;
extern int windowedfailed;
void FixFL(); void FixFL();
void DoFCEUExit(); void DoFCEUExit();

3
src/drivers/win/video.cpp
View File

@ -21,6 +21,8 @@
#include "video.h" #include "video.h"
static int RecalcCustom(void); static int RecalcCustom(void);
void InputScreenChanged(int fs);
void UpdateRendBounds();
static DDCAPS caps; static DDCAPS caps;
static int mustrestore=0; static int mustrestore=0;
@ -240,6 +242,7 @@ int SetVideoMode(int fs)
ddrval = IDirectDraw7_CreateSurface ( lpDD7, &ddsd, &lpDDSPrimary,(IUnknown FAR*)NULL); ddrval = IDirectDraw7_CreateSurface ( lpDD7, &ddsd, &lpDDSPrimary,(IUnknown FAR*)NULL);
if (ddrval != DD_OK) if (ddrval != DD_OK)
{ {
void FCEU_PrintError(char *format, ...);
FCEU_PrintError("%08x, %d\n",ddrval,lpDD7); FCEU_PrintError("%08x, %d\n",ddrval,lpDD7);
ShowDDErr("Error creating primary surface."); ShowDDErr("Error creating primary surface.");
return 1; return 1;

22
vc8/fceux.vcproj
View File

@ -1044,6 +1044,28 @@
RelativePath="..\src\drivers\win\tracer.h" RelativePath="..\src\drivers\win\tracer.h"
> >
</File> </File>
<File
RelativePath="..\src\drivers\win\video.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\src\drivers\win\video.h" RelativePath="..\src\drivers\win\video.h"
> >