aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2009-02-16 09:44:00 +0000
committerTravis Howell2009-02-16 09:44:00 +0000
commit954aa46b8ae1fa34ee2f3e134904de08f138a0af (patch)
tree0c99cb4fff67cc2c39c62ac6842aaa25d3848e4b
parentee92dbbe41c2789e7e237f524d184de11de47eef (diff)
downloadscummvm-rg350-954aa46b8ae1fa34ee2f3e134904de08f138a0af.tar.gz
scummvm-rg350-954aa46b8ae1fa34ee2f3e134904de08f138a0af.tar.bz2
scummvm-rg350-954aa46b8ae1fa34ee2f3e134904de08f138a0af.zip
SCUMMVM define no longer required.
svn-id: r38361
-rw-r--r--engines/sci/module.mk1
-rw-r--r--engines/sci/sfx/device/devices.cpp24
-rw-r--r--engines/sci/sfx/pcm_device/pcm_devices.cpp24
-rw-r--r--engines/sci/sfx/seq/sequencers.cpp15
-rw-r--r--engines/sci/sfx/timer/timers.cpp20
5 files changed, 0 insertions, 84 deletions
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 6412b75365..63f9bdc879 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -92,7 +92,6 @@ MODULE_OBJS = \
# FIXME: The following is supposed to be a set of *temporary* hacks
CXXFLAGS += -Wno-variadic-macros
-CPPFLAGS += -DSCUMMVM
# Generate savegame.cpp
$(srcdir)/engines/sci/engine/savegame.cpp: $(srcdir)/engines/sci/engine/savegame.cfsml
diff --git a/engines/sci/sfx/device/devices.cpp b/engines/sci/sfx/device/devices.cpp
index 6a89ee5df6..903256c0c9 100644
--- a/engines/sci/sfx/device/devices.cpp
+++ b/engines/sci/sfx/device/devices.cpp
@@ -31,33 +31,9 @@
#include "../device.h"
#include <stdio.h>
-#ifndef SCUMMVM
-#ifdef HAVE_ALSA
-extern struct _midi_device sfx_device_midi_alsa;
-#endif
-#if !defined(WIN32) && !defined(__DC__) && !defined(__MORPHOS__) && !defined(ARM_WINCE) && !defined(_GP32)
-extern struct _midi_device sfx_device_midi_unixraw;
-#endif
-
-#ifdef HAVE_PROTO_CAMD_H
-extern struct _midi_device sfx_device_midi_camd;
-#endif
-#endif // SCUMMVM
-
#include "sci/include/resource.h"
static struct _midi_device *devices_midi[] = {
-#ifndef SCUMMVM
-#ifdef HAVE_PROTO_CAMD_H
- &sfx_device_midi_camd,
-#endif
-#ifdef HAVE_ALSA
- &sfx_device_midi_alsa,
-#endif
-#ifdef UNIX
- &sfx_device_midi_unixraw,
-#endif
-#endif // SCUMMVM
NULL
};
diff --git a/engines/sci/sfx/pcm_device/pcm_devices.cpp b/engines/sci/sfx/pcm_device/pcm_devices.cpp
index 54011bd773..866372a670 100644
--- a/engines/sci/sfx/pcm_device/pcm_devices.cpp
+++ b/engines/sci/sfx/pcm_device/pcm_devices.cpp
@@ -21,36 +21,12 @@
#include "sci/include/resource.h"
#ifndef NO_PCMOUT
-#ifdef SCUMMVM
extern sfx_pcm_device_t sfx_pcm_driver_scummvm;
-#else // SCUMMVM
-# ifdef HAVE_SDL
-extern sfx_pcm_device_t sfx_pcm_driver_sdl;
-# endif
-# ifdef HAVE_ALSA
-extern sfx_pcm_device_t sfx_pcm_driver_alsa;
-# endif
-# ifdef __DC__
-extern sfx_pcm_device_t sfx_pcm_driver_dc;
-# endif
-#endif // SCUMMVM
#endif
sfx_pcm_device_t *pcmout_drivers[] = {
#ifndef NO_PCMOUT
-#ifdef SCUMMVM
&sfx_pcm_driver_scummvm,
-#else // SCUMMVM
-# ifdef HAVE_SDL
- &sfx_pcm_driver_sdl,
-# endif
-# ifdef HAVE_ALSA
- &sfx_pcm_driver_alsa,
-# endif
-# ifdef __DC__
- &sfx_pcm_driver_dc,
-# endif
-#endif // SCUMMVM
#endif
NULL
};
diff --git a/engines/sci/sfx/seq/sequencers.cpp b/engines/sci/sfx/seq/sequencers.cpp
index 38395c9f8f..960921dfa6 100644
--- a/engines/sci/sfx/seq/sequencers.cpp
+++ b/engines/sci/sfx/seq/sequencers.cpp
@@ -28,22 +28,7 @@
#include "../sequencer.h"
#include "sci/include/resource.h"
-#ifndef SCUMMVM
-extern sfx_sequencer_t sfx_sequencer_gm;
-extern sfx_sequencer_t sfx_sequencer_mt32;
-#ifdef HAVE_SYS_SOUNDCARD_H
-extern sfx_sequencer_t sfx_sequencer_oss_adlib;
-#endif
-#endif // SCUMMVM
-
sfx_sequencer_t *sfx_sequencers[] = {
-#ifndef SCUMMVM
- &sfx_sequencer_gm,
- &sfx_sequencer_mt32,
-#ifdef HAVE_SYS_SOUNDCARD_H
- &sfx_sequencer_oss_adlib,
-#endif
-#endif // SCUMMVM
NULL
};
diff --git a/engines/sci/sfx/timer/timers.cpp b/engines/sci/sfx/timer/timers.cpp
index 3caf21f6b1..82a1d11d6c 100644
--- a/engines/sci/sfx/timer/timers.cpp
+++ b/engines/sci/sfx/timer/timers.cpp
@@ -28,30 +28,10 @@
#include "sci/include/sfx_timer.h"
#include "sci/include/resource.h"
-#ifdef SCUMMVM
extern sfx_timer_t sfx_timer_scummvm;
-#else // SCUMMVM
-
-#ifdef HAVE_SETITIMER
-extern sfx_timer_t sfx_timer_sigalrm;
-#endif
-
-#ifdef __DC__
-extern sfx_timer_t sfx_timer_pthread;
-#endif
-#endif // SCUMMVM
sfx_timer_t *sfx_timers[] = {
-#ifdef SCUMMVM
&sfx_timer_scummvm,
-#else // SCUMMVM
-#ifdef HAVE_SETITIMER
- &sfx_timer_sigalrm,
-#endif
-#ifdef __DC__
- &sfx_timer_pthread,
-#endif
-#endif // SCUMMVM
NULL
};