diff --git a/Src/CPU/68K/68K.cpp b/Src/CPU/68K/68K.cpp index 16bced0..833e1e8 100644 --- a/Src/CPU/68K/68K.cpp +++ b/Src/CPU/68K/68K.cpp @@ -58,8 +58,10 @@ static Debugger::CMusashi68KDebug *s_Debug = NULL; // IRQ callback static int (*IRQAck)(int nIRQ) = NULL; +#ifdef SUPERMODEL_DEBUGGER // Cycles remaining in timeslice static int s_lastCycles; +#endif /****************************************************************************** diff --git a/Src/CPU/PowerPC/ppc603.c b/Src/CPU/PowerPC/ppc603.c index 43af6b3..927d023 100644 --- a/Src/CPU/PowerPC/ppc603.c +++ b/Src/CPU/PowerPC/ppc603.c @@ -206,13 +206,6 @@ void ppc603_exception(int exception) } } -static void ppc603_set_smi_line(int state) -{ - if( state ) { - ppc.interrupt_pending |= 0x4; - } -} - static void ppc603_check_interrupts(void) { if (MSR & MSR_EE) diff --git a/Src/Graphics/New3D/R3DScrollFog.cpp b/Src/Graphics/New3D/R3DScrollFog.cpp index 2a75ca8..ecb12c9 100644 --- a/Src/Graphics/New3D/R3DScrollFog.cpp +++ b/Src/Graphics/New3D/R3DScrollFog.cpp @@ -130,7 +130,7 @@ void main() void R3DScrollFog::AllocResources() { - bool success = LoadShaderProgram(&m_shaderProgram, &m_vertexShader, &m_fragmentShader, m_config["VertexShaderFog"].ValueAs(), m_config["FragmentShaderFog"].ValueAs(), vertexShaderFog, fragmentShaderFog); + /*bool success = */LoadShaderProgram(&m_shaderProgram, &m_vertexShader, &m_fragmentShader, m_config["VertexShaderFog"].ValueAs(), m_config["FragmentShaderFog"].ValueAs(), vertexShaderFog, fragmentShaderFog); m_locFogColour = glGetUniformLocation(m_shaderProgram, "fogColour"); m_locFogAttenuation = glGetUniformLocation(m_shaderProgram, "fogAttenuation"); diff --git a/Src/Model3/SoundBoard.cpp b/Src/Model3/SoundBoard.cpp index 211d12b..71da92d 100644 --- a/Src/Model3/SoundBoard.cpp +++ b/Src/Model3/SoundBoard.cpp @@ -351,6 +351,7 @@ void CSoundBoard::WriteMIDIPort(UINT8 data) DSB->SendCommand(data); } +#ifdef SUPERMODEL_LOG_AUDIO static INT16 ClampINT16(float x) { INT32 xi = (INT32)x; @@ -362,6 +363,7 @@ static INT16 ClampINT16(float x) } return (INT16)xi; } +#endif bool CSoundBoard::RunFrame(void) { @@ -569,19 +571,6 @@ CSoundBoard::CSoundBoard(const Util::Config::Node &config) DebugLog("Built Sound Board\n"); } -static void Reverse16(UINT8 *buf, unsigned size) -{ - unsigned i; - UINT8 tmp; - - for (i = 0; i < size; i += 2) - { - tmp = buf[i+0]; - buf[i+0] = buf[i+1]; - buf[i+1] = tmp; - } -} - CSoundBoard::~CSoundBoard(void) { #ifdef SUPERMODEL_LOG_AUDIO diff --git a/Src/Sound/SCSP.cpp b/Src/Sound/SCSP.cpp index 517ac1b..f2f78d1 100644 --- a/Src/Sound/SCSP.cpp +++ b/Src/Sound/SCSP.cpp @@ -124,7 +124,6 @@ static const double srate=44100; static CMutex *MIDILock; // for safe access to the MIDI FIFOs static int (*Run68kCB)(int cycles); static void (*Int68kCB)(int irq); -static void (*RetIntCB)(); static DWORD IrqTimA; static DWORD IrqTimBC; static DWORD IrqMidi;