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 11:45:50 +00:00
parent e018632901
commit 49b05ff178
6 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/win/config.cpp
View File

@ -26,6 +26,20 @@
/* */
/****************************************************************/
#include "config.h"
#include "common.h"
#include "main.h"
#include "window.h"
#include "video.h"
extern CFGSTRUCT NetplayConfig[];
extern CFGSTRUCT InputConfig[];
extern CFGSTRUCT HotkeyConfig[];
extern int autoHoldKey, autoHoldClearKey;
extern int frame_display;
extern int input_display;
extern char *BasicBotDir;
/**
* Structure that contains configuration information
**/
@ -125,7 +139,7 @@ static CFGSTRUCT fceuconfig[] = {
ENDCFGSTRUCT
};
static void SaveConfig(char *filename)
void SaveConfig(const char *filename)
{
SaveFCEUConfig(filename,fceuconfig);
}

4
src/drivers/win/config.h Normal file
View File

@ -0,0 +1,4 @@
void SaveConfig(const char *filename);
void LoadConfig(const char *filename);
extern int UsrInputType[3];

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

@ -52,6 +52,7 @@
#include "basicbot.h"
#include "args.h"
#include "config.h"
// #defines
@ -442,7 +443,6 @@ void DoPriority(void)
#include "sound.cpp"
#include "video.cpp"
#include "window.cpp"
#include "config.cpp"
int DriverInitialize()
{

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

@ -1,4 +1,29 @@
#include "../../types.h"
static int genie;
static int pal_emulation;
static int status_icon;
extern int eoptions;
static int fullscreen;
static int vmod;
static char *gfsdir;
static char *directory_names[6];
static double winsizemulx, winsizemuly;
static double saspectw, saspecth;
static int soundrate;
static int soundbuftime;
static int soundvolume;
static int soundquality;
static uint32 goptions;
static uint8 cpalette[192];
static int srendlinen;
static int erendlinen;
static int srendlinep;
static int erendlinep;
static int ismaximized;
static int maxconbskip;
static int ffbskip;
static int moviereadonly;
extern int soundo;
extern int eoptions;
extern int soundoptions;

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

@ -18,42 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "video.h"
static int RecalcCustom(void);
#define VF_DDSTRETCHED 1
#define VEF_LOSTSURFACE 1
#define VEF____INTERNAL 2
#define VMDF_DXBLT 1
#define VMDF_STRFS 2
typedef struct {
int x;
int y;
int bpp;
int flags;
int xscale;
int yscale;
RECT srect;
RECT drect;
int special;
} vmdef;
// left, top, right, bottom
static vmdef vmodes[11]={
{320,240,8,0,1,1,0}, //0
{320,240,8,0,1,1,0}, //1
{512,384,8,0,1,1,0}, //2
{640,480,8,0,1,1,0}, //3
{640,480,8,0,1,1,0}, //4
{640,480,8,0,1,1,0}, //5
{640,480,8,VMDF_DXBLT,2,2,0}, //6
{1024,768,8,VMDF_DXBLT,4,3,0}, //7
{1280,1024,8,VMDF_DXBLT,5,4,0}, //8
{1600,1200,8,VMDF_DXBLT,6,5,0}, //9
{800,600,8,VMDF_DXBLT|VMDF_STRFS,0,0} //10
};
static DDCAPS caps;
static int mustrestore=0;
static DWORD CBM[3];
@ -61,7 +29,6 @@ static DWORD CBM[3];
static int bpp;
static int vflags;
static int veflags;
static int winspecial = 0;
int disvaccel = 0; /* Disable video hardware acceleration. */

34
vc8/fceux.vcproj
View File

@ -788,6 +788,32 @@
RelativePath="..\src\drivers\win\common.h"
>
</File>
<File
RelativePath="..\src\drivers\win\config.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)2.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)2.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\drivers\win\config.h"
>
</File>
<File
RelativePath="..\src\drivers\win\debugger.cpp"
>
@ -992,6 +1018,14 @@
RelativePath="..\src\drivers\win\tracer.h"
>
</File>
<File
RelativePath="..\src\drivers\win\video.h"
>
</File>
<File
RelativePath="..\src\drivers\win\window.h"
>
</File>
<Filter
Name="res"
>