SDL: fixed latest compilation errors due to r1209. static != extern in gcc
This commit is contained in:
parent
4567f5b7e0
commit
13f923675a
|
@ -9,6 +9,8 @@ my_list = Split("""
|
||||||
121.cpp
|
121.cpp
|
||||||
15.cpp
|
15.cpp
|
||||||
164.cpp
|
164.cpp
|
||||||
|
175.cpp
|
||||||
|
176.cpp
|
||||||
177.cpp
|
177.cpp
|
||||||
178.cpp
|
178.cpp
|
||||||
179.cpp
|
179.cpp
|
||||||
|
@ -46,6 +48,7 @@ bmc70in1.cpp
|
||||||
bonza.cpp
|
bonza.cpp
|
||||||
bs-5.cpp
|
bs-5.cpp
|
||||||
copyfami_mmc3.cpp
|
copyfami_mmc3.cpp
|
||||||
|
dance.cpp
|
||||||
datalatch.cpp
|
datalatch.cpp
|
||||||
deirom.cpp
|
deirom.cpp
|
||||||
dream.cpp
|
dream.cpp
|
||||||
|
@ -69,6 +72,7 @@ n106.cpp
|
||||||
n625092.cpp
|
n625092.cpp
|
||||||
novel.cpp
|
novel.cpp
|
||||||
sachen.cpp
|
sachen.cpp
|
||||||
|
sc-127.cpp
|
||||||
sheroes.cpp
|
sheroes.cpp
|
||||||
sl1632.cpp
|
sl1632.cpp
|
||||||
smb2j.cpp
|
smb2j.cpp
|
||||||
|
|
|
@ -45,7 +45,7 @@ D6-D0 - Small Page High Address (D6,D5,D4,D3,D2,D1,D0,A11,A10,A9,A8,A7,A6,A5,A4,
|
||||||
|
|
||||||
static uint8 reg[3];
|
static uint8 reg[3];
|
||||||
|
|
||||||
static uint8 *CHRRAM=NULL;
|
//static uint8 *CHRRAM=NULL; // already declared in mmc3.h. static != extern
|
||||||
static uint32 CHRRAMSIZE;
|
static uint32 CHRRAMSIZE;
|
||||||
|
|
||||||
static SFORMAT StateRegs[]=
|
static SFORMAT StateRegs[]=
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include "mapinc.h"
|
#include "mapinc.h"
|
||||||
#include "mmc3.h"
|
#include "mmc3.h"
|
||||||
|
|
||||||
static uint8 *CHRRAM;
|
//static uint8 *CHRRAM; // already declared in mmc3.h. static != extern
|
||||||
static uint8 tekker;
|
static uint8 tekker;
|
||||||
|
|
||||||
static void MSHCW(uint32 A, uint8 V)
|
static void MSHCW(uint32 A, uint8 V)
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include "mapinc.h"
|
#include "mapinc.h"
|
||||||
#include "mmc3.h"
|
#include "mmc3.h"
|
||||||
|
|
||||||
static uint8 *CHRRAM = NULL;
|
//static uint8 *CHRRAM = NULL; // CHRRAM is already declared in mmc3.h. Besides, static and extern don't really go well together.
|
||||||
static int masko8[8]={63,31,15,1,3,0,0,0};
|
static int masko8[8]={63,31,15,1,3,0,0,0};
|
||||||
|
|
||||||
static void Super24PW(uint32 A, uint8 V)
|
static void Super24PW(uint32 A, uint8 V)
|
||||||
|
|
|
@ -115,12 +115,12 @@ InitConfig()
|
||||||
|
|
||||||
// sound options
|
// sound options
|
||||||
config->addOption('s', "sound", "SDL.Sound", 1);
|
config->addOption('s', "sound", "SDL.Sound", 1);
|
||||||
config->addOption("volume", "SDL.SoundVolume", 100);
|
config->addOption("volume", "SDL.SoundVolume", 150);
|
||||||
config->addOption("trianglevol", "SDL.TriangleVolume", 100);
|
config->addOption("trianglevol", "SDL.TriangleVolume", 256);
|
||||||
config->addOption("square1vol", "SDL.Square1Volume", 100);
|
config->addOption("square1vol", "SDL.Square1Volume", 256);
|
||||||
config->addOption("square2vol", "SDL.Square2Volume", 100);
|
config->addOption("square2vol", "SDL.Square2Volume", 256);
|
||||||
config->addOption("noisevol", "SDL.NoiseVolume", 100);
|
config->addOption("noisevol", "SDL.NoiseVolume", 256);
|
||||||
config->addOption("pcmvol", "SDL.PCMVolume", 100);
|
config->addOption("pcmvol", "SDL.PCMVolume", 256);
|
||||||
config->addOption("soundrate", "SDL.SoundRate", 11000);
|
config->addOption("soundrate", "SDL.SoundRate", 11000);
|
||||||
config->addOption("soundq", "SDL.SoundQuality", 1);
|
config->addOption("soundq", "SDL.SoundQuality", 1);
|
||||||
config->addOption("soundrecord", "SDL.SoundRecordFile", "");
|
config->addOption("soundrecord", "SDL.SoundRecordFile", "");
|
||||||
|
@ -358,8 +358,9 @@ UpdateEMUCore(Config *config)
|
||||||
config->getOption("SDL.DisableSpriteLimit", &flag);
|
config->getOption("SDL.DisableSpriteLimit", &flag);
|
||||||
FCEUI_DisableSpriteLimitation(flag ? 1 : 0);
|
FCEUI_DisableSpriteLimitation(flag ? 1 : 0);
|
||||||
|
|
||||||
config->getOption("SDL.SnapName", &flag);
|
//Not used anymore.
|
||||||
FCEUI_SetSnapName(flag ? true : false);
|
//config->getOption("SDL.SnapName", &flag);
|
||||||
|
//FCEUI_SetSnapName(flag ? true : false);
|
||||||
|
|
||||||
config->getOption("SDL.ScanLineStart", &start);
|
config->getOption("SDL.ScanLineStart", &start);
|
||||||
config->getOption("SDL.ScanLineEnd", &end);
|
config->getOption("SDL.ScanLineEnd", &end);
|
||||||
|
|
|
@ -92,12 +92,12 @@ char *DriverUsage="\
|
||||||
--soundrate x Sets sound playback rate to x Hz.\n\
|
--soundrate x Sets sound playback rate to x Hz.\n\
|
||||||
--soundq {0|1} Enables high sound quality.\n\
|
--soundq {0|1} Enables high sound quality.\n\
|
||||||
--soundbufsize x Sets sound buffer size to x ms.\n\
|
--soundbufsize x Sets sound buffer size to x ms.\n\
|
||||||
--volume {0-100} Sets volume.\n\
|
--volume {0-150} Sets volume.\n\
|
||||||
--trianglevol {0-100} Sets Triangle volume.\n\
|
--trianglevol {0-256} Sets Triangle volume.\n\
|
||||||
--square1vol {0-100} Sets Square 1 volume.\n\
|
--square1vol {0-256} Sets Square 1 volume.\n\
|
||||||
--square2vol {0-100} Sets Square 2 volume.\n\
|
--square2vol {0-256} Sets Square 2 volume.\n\
|
||||||
--noisevol {0-100} Sets Noise volume.\n\
|
--noisevol {0-256} Sets Noise volume.\n\
|
||||||
--pcmvol {0-100} Sets PCM volume.\n\
|
--pcmvol {0-256} Sets PCM volume.\n\
|
||||||
--lowpass {0|1} Enables low-pass filter if x is nonzero.\n\
|
--lowpass {0|1} Enables low-pass filter if x is nonzero.\n\
|
||||||
--soundrecord f Records sound to file f.\n\
|
--soundrecord f Records sound to file f.\n\
|
||||||
--input(1,2) d Set the input device for input 1 or 2.\n\
|
--input(1,2) d Set the input device for input 1 or 2.\n\
|
||||||
|
|
Loading…
Reference in New Issue