[Scummvm-cvs-logs] SF.net SVN: scummvm: [21605] scummvm/trunk/base

[fingolfin at users.sourceforge.net]

Revision: 21605
Author:   fingolfin
Date:     2006-04-04 14:45:13 -0700 (Tue, 04 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21605&view=rev

Log Message:
-----------
Don't use HAVE_CONFIG_H / config.h directly, use scummsys.h instead

Modified Paths:
--------------
    scummvm/trunk/backends/midi/alsa.cpp
    scummvm/trunk/backends/sdl/sdl.cpp
    scummvm/trunk/base/gameDetector.cpp
    scummvm/trunk/graphics/scaler/scale2x.cpp
    scummvm/trunk/graphics/scaler/scale3x.cpp
    scummvm/trunk/graphics/scaler/scalebit.cpp
    scummvm/trunk/sound/softsynth/fluidsynth.cpp
Modified: scummvm/trunk/backends/midi/alsa.cpp
===================================================================
--- scummvm/trunk/backends/midi/alsa.cpp	2006-04-04 21:32:19 UTC (rev 21604)
+++ scummvm/trunk/backends/midi/alsa.cpp	2006-04-04 21:45:13 UTC (rev 21605)
@@ -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)
 

Modified: scummvm/trunk/backends/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/sdl/sdl.cpp	2006-04-04 21:32:19 UTC (rev 21604)
+++ scummvm/trunk/backends/sdl/sdl.cpp	2006-04-04 21:45:13 UTC (rev 21605)
@@ -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__)

Modified: scummvm/trunk/base/gameDetector.cpp
===================================================================
--- scummvm/trunk/base/gameDetector.cpp	2006-04-04 21:32:19 UTC (rev 21604)
+++ scummvm/trunk/base/gameDetector.cpp	2006-04-04 21:45:13 UTC (rev 21605)
@@ -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>

Modified: scummvm/trunk/graphics/scaler/scale2x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/scale2x.cpp	2006-04-04 21:32:19 UTC (rev 21604)
+++ scummvm/trunk/graphics/scaler/scale2x.cpp	2006-04-04 21:45:13 UTC (rev 21605)
@@ -32,14 +32,12 @@
  * - 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 "graphics/scaler/scale2x.h"
 
-#include "scale2x.h"
-
 #include <assert.h>
 
 /***************************************************************************/

Modified: scummvm/trunk/graphics/scaler/scale3x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/scale3x.cpp	2006-04-04 21:32:19 UTC (rev 21604)
+++ scummvm/trunk/graphics/scaler/scale3x.cpp	2006-04-04 21:45:13 UTC (rev 21605)
@@ -32,14 +32,12 @@
  * - 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 "graphics/scaler/scale3x.h"
 
-#include "scale3x.h"
-
 #include <assert.h>
 
 /***************************************************************************/

Modified: scummvm/trunk/graphics/scaler/scalebit.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/scalebit.cpp	2006-04-04 21:32:19 UTC (rev 21604)
+++ scummvm/trunk/graphics/scaler/scalebit.cpp	2006-04-04 21:45:13 UTC (rev 21605)
@@ -33,15 +33,13 @@
  * - 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 "graphics/scaler/scale2x.h"
+#include "graphics/scaler/scale3x.h"
 
-#include "scale2x.h"
-#include "scale3x.h"
-
 #if defined(HAVE_ALLOCA_H)
 #include <alloca.h>
 #endif

Modified: scummvm/trunk/sound/softsynth/fluidsynth.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fluidsynth.cpp	2006-04-04 21:32:19 UTC (rev 21604)
+++ scummvm/trunk/sound/softsynth/fluidsynth.cpp	2006-04-04 21:45:13 UTC (rev 21605)
@@ -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
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.