aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortwinaphex2016-08-08 05:20:28 +0200
committertwinaphex2016-08-08 05:20:28 +0200
commit27e31e6ae6d27c3bb528ef30c3cf38ff50f8b42f (patch)
tree54996f860a9944a3146ae863b06cdf790ad66dba
parent69d757c58d5d32363ba38bba4139053ea62f2ad8 (diff)
downloadsnesemu-27e31e6ae6d27c3bb528ef30c3cf38ff50f8b42f.tar.gz
snesemu-27e31e6ae6d27c3bb528ef30c3cf38ff50f8b42f.tar.bz2
snesemu-27e31e6ae6d27c3bb528ef30c3cf38ff50f8b42f.zip
Remove DJGPP ifdefs
-rw-r--r--source/apu.c5
-rw-r--r--source/port.h5
-rw-r--r--source/soundux.c32
3 files changed, 0 insertions, 42 deletions
diff --git a/source/apu.c b/source/apu.c
index d3dce48..5f24cad 100644
--- a/source/apu.c
+++ b/source/apu.c
@@ -89,11 +89,6 @@
#ifndef USE_BLARGG_APU
-#ifdef __DJGPP
-#include <allegro.h>
-#undef true
-#endif
-
#include "snes9x.h"
#include "spc700.h"
#include "apu.h"
diff --git a/source/port.h b/source/port.h
index 6439815..63f0d67 100644
--- a/source/port.h
+++ b/source/port.h
@@ -138,13 +138,8 @@ void _splitpath(const char* path, char* drive, char* dir, char* fname,
void S9xGenerateSound(void);
-#ifdef __DJGPP
#define SLASH_STR "/"
#define SLASH_CHAR '/'
-#else
-#define SLASH_STR "/"
-#define SLASH_CHAR '/'
-#endif
#if defined(__i386__) || defined(__i486__) || defined(__i586__) || \
defined(__WIN32__) || defined(__alpha__)
diff --git a/source/soundux.c b/source/soundux.c
index c10abf5..a35c445 100644
--- a/source/soundux.c
+++ b/source/soundux.c
@@ -88,11 +88,6 @@
*******************************************************************************/
#ifndef USE_BLARGG_APU
-#ifdef __DJGPP__
-#include <allegro.h>
-#undef true
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -196,17 +191,11 @@ void S9xAPUSetEndOfSample(int i, Channel* ch)
APU.DSP [APU_KOFF] &= ~(1 << i);
APU.KeyedChannels &= ~(1 << i);
}
-#ifdef __DJGPP
-END_OF_FUNCTION(S9xAPUSetEndOfSample)
-#endif
void S9xAPUSetEndX(int ch)
{
APU.DSP [APU_ENDX] |= 1 << ch;
}
-#ifdef __DJGPP
-END_OF_FUNCTION(S9xAPUSetEndX)
-#endif
void S9xSetEnvRate(Channel* ch, uint32_t rate, int direction, int target)
{
@@ -244,9 +233,6 @@ void S9xSetEnvRate(Channel* ch, uint32_t rate, int direction, int target)
}
}
-#ifdef __DJGPP
-END_OF_FUNCTION(S9xSetEnvRate);
-#endif
void S9xSetEnvelopeRate(int channel, uint32_t rate, int direction,
int target)
@@ -254,9 +240,6 @@ void S9xSetEnvelopeRate(int channel, uint32_t rate, int direction,
S9xSetEnvRate(&SoundData.channels [channel], rate, direction, target);
}
-#ifdef __DJGPP
-END_OF_FUNCTION(S9xSetEnvelopeRate);
-#endif
void S9xSetSoundVolume(int channel, int16_t volume_left, int16_t volume_right)
{
@@ -1074,22 +1057,11 @@ stereo_exit:
}
}
-#ifdef __DJGPP
-END_OF_FUNCTION(MixStereo);
-#endif
-
-#ifdef __sun
-extern uint8_t int2ulaw(int);
-#endif
-
// For backwards compatibility with older port specific code
void S9xMixSamplesO(uint8_t* buffer, int sample_count, int byte_offset)
{
S9xMixSamples(buffer + byte_offset, sample_count);
}
-#ifdef __DJGPP
-END_OF_FUNCTION(S9xMixSamplesO);
-#endif
void S9xMixSamples(uint8_t* buffer, int sample_count)
{
@@ -1184,10 +1156,6 @@ void S9xMixSamples(uint8_t* buffer, int sample_count)
}
-#ifdef __DJGPP
-END_OF_FUNCTION(S9xMixSamples);
-#endif
-
void S9xResetSound(bool full)
{
int i;