diff options
| author | Max Horn | 2006-04-04 21:45:13 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-04 21:45:13 +0000 |
| commit | e4930bd96d3f5d8947f4ffd012cdf5a8131b686d (patch) | |
| tree | f56ad9e2f7c1a81a22644972c2478f071835f464 | |
| parent | 595a48a87e73db770057bf5ec5a9104582877e18 (diff) | |
| download | scummvm-rg350-e4930bd96d3f5d8947f4ffd012cdf5a8131b686d.tar.gz scummvm-rg350-e4930bd96d3f5d8947f4ffd012cdf5a8131b686d.tar.bz2 scummvm-rg350-e4930bd96d3f5d8947f4ffd012cdf5a8131b686d.zip | |
Don't use HAVE_CONFIG_H / config.h directly, use scummsys.h instead
svn-id: r21605
| -rw-r--r-- | backends/midi/alsa.cpp | 5 | ||||
| -rw-r--r-- | backends/sdl/sdl.cpp | 4 | ||||
| -rw-r--r-- | base/gameDetector.cpp | 4 | ||||
| -rw-r--r-- | graphics/scaler/scale2x.cpp | 8 | ||||
| -rw-r--r-- | graphics/scaler/scale3x.cpp | 8 | ||||
| -rw-r--r-- | graphics/scaler/scalebit.cpp | 10 | ||||
| -rw-r--r-- | sound/softsynth/fluidsynth.cpp | 5 |
7 files changed, 14 insertions, 30 deletions
diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index 5a109148a4..5a59a7d063 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -20,9 +20,8 @@ * $Id$ */ -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif +#include "common/stdafx.h" +#include "common/scummsys.h" #if defined(UNIX) && defined(USE_ALSA) diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp index ed3371d4fb..89352c7779 100644 --- a/backends/sdl/sdl.cpp +++ b/backends/sdl/sdl.cpp @@ -26,10 +26,6 @@ #include "common/util.h" #include "base/main.h" -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif - #include "scummvm.xpm" #if defined(__amigaos4__) diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index eb6acab5de..a08ce3efb0 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -34,10 +34,6 @@ #include "sound/mididrv.h" #include "sound/mixer.h" -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif - #ifdef UNIX #include <errno.h> #include <sys/stat.h> diff --git a/graphics/scaler/scale2x.cpp b/graphics/scaler/scale2x.cpp index 6e4bc7aa62..9426da1b74 100644 --- a/graphics/scaler/scale2x.cpp +++ b/graphics/scaler/scale2x.cpp @@ -32,13 +32,11 @@ * - derivative works of the program are allowed. */ -#if HAVE_CONFIG_H -#include <config.h> -#endif +#include "common/stdafx.h" +#include "common/scummsys.h" #include "graphics/scaler/intern.h" - -#include "scale2x.h" +#include "graphics/scaler/scale2x.h" #include <assert.h> diff --git a/graphics/scaler/scale3x.cpp b/graphics/scaler/scale3x.cpp index e306540596..9d9e0ebfd7 100644 --- a/graphics/scaler/scale3x.cpp +++ b/graphics/scaler/scale3x.cpp @@ -32,13 +32,11 @@ * - derivative works of the program are allowed. */ -#if HAVE_CONFIG_H -#include <config.h> -#endif +#include "common/stdafx.h" +#include "common/scummsys.h" #include "graphics/scaler/intern.h" - -#include "scale3x.h" +#include "graphics/scaler/scale3x.h" #include <assert.h> diff --git a/graphics/scaler/scalebit.cpp b/graphics/scaler/scalebit.cpp index 9ff0c6da1e..c68abfeb0a 100644 --- a/graphics/scaler/scalebit.cpp +++ b/graphics/scaler/scalebit.cpp @@ -33,14 +33,12 @@ * - derivative works of the program are allowed. */ -#if defined(HAVE_CONFIG_H) -#include <config.h> -#endif +#include "common/stdafx.h" +#include "common/scummsys.h" #include "graphics/scaler/intern.h" - -#include "scale2x.h" -#include "scale3x.h" +#include "graphics/scaler/scale2x.h" +#include "graphics/scaler/scale3x.h" #if defined(HAVE_ALLOCA_H) #include <alloca.h> diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp index 316451841c..53cf2ed527 100644 --- a/sound/softsynth/fluidsynth.cpp +++ b/sound/softsynth/fluidsynth.cpp @@ -19,9 +19,8 @@ * $Id$ */ -#if defined(HAVE_CONFIG_H) -#include "config.h" -#endif +#include "common/stdafx.h" +#include "common/scummsys.h" #ifdef USE_FLUIDSYNTH |