diff options
| author | Nicola Mettifogo | 2007-03-09 00:13:07 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-03-09 00:13:07 +0000 |
| commit | 1e985051a9b24eb8efaca590d59b5e95aec600d9 (patch) | |
| tree | 40883c5f2b4cc7f88a8dd03e995c7dba80e7d96c | |
| parent | a3c2c1f413049fd9d0e92f89b37b37755b6b5105 (diff) | |
| download | scummvm-rg350-1e985051a9b24eb8efaca590d59b5e95aec600d9.tar.gz scummvm-rg350-1e985051a9b24eb8efaca590d59b5e95aec600d9.tar.bz2 scummvm-rg350-1e985051a9b24eb8efaca590d59b5e95aec600d9.zip | |
reduced dependency from windows-specific header files
svn-id: r26034
| -rw-r--r-- | backends/midi/windows.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 4 | ||||
| -rw-r--r-- | common/config-manager.cpp | 4 | ||||
| -rw-r--r-- | common/stdafx.h | 9 | ||||
| -rw-r--r-- | engines/engine.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/he/resource_he.h | 4 |
6 files changed, 16 insertions, 13 deletions
diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index c93468a35a..3aed1a8b37 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -21,6 +21,9 @@ #if defined(WIN32) && !defined(_WIN32_WCE) + +#include <windows.h> +#include <mmsystem.h> #include "common/stdafx.h" #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 1835f70f25..ee43d2ee26 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -33,6 +33,10 @@ #include "icons/scummvm.xpm" +#if defined(WIN32) +#include <windows.h> +#endif + #if defined(__SYMBIAN32__) #include "SymbianOs.h" #endif diff --git a/common/config-manager.cpp b/common/config-manager.cpp index afe28a820c..8da061406b 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -29,6 +29,10 @@ DECLARE_SINGLETON(Common::ConfigManager); +#if defined(WIN32) +#include <windows.h> +#endif + #ifdef __PLAYSTATION2__ #include "backends/platform/ps2/systemps2.h" #endif diff --git a/common/stdafx.h b/common/stdafx.h index 71b48e3136..95a5e3c4ba 100644 --- a/common/stdafx.h +++ b/common/stdafx.h @@ -94,20 +94,11 @@ #endif - - #include <windows.h> #if defined(ARRAYSIZE) // VS2005beta2 introduces new stuff in winnt.h #undef ARRAYSIZE #endif - #include <io.h> - #include <fcntl.h> - #include <conio.h> - #include <mmsystem.h> - #include <winuser.h> - #include <direct.h> - #endif #if defined(__QNXNTO__) diff --git a/engines/engine.cpp b/engines/engine.cpp index 5ba7acbffe..a869ba95cc 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -29,6 +29,11 @@ #include "gui/message.h" #include "sound/mixer.h" +#if defined(WIN32) +#include <windows.h> +#include <direct.h> +#endif + #ifdef _WIN32_WCE extern bool isSmartphone(void); #endif diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index c287108abc..e4e4d73e13 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -56,11 +56,9 @@ namespace Scumm { #define IMAGE_DOS_SIGNATURE 0x5A4D /* MZ */ #define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */ -#if !defined (WIN32) #define IMAGE_SCN_CNT_CODE 0x00000020 #define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 #define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 -#endif // Only IMAGE_DIRECTORY_ENTRY_RESOURCE is used: #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 @@ -80,7 +78,6 @@ namespace Scumm { #define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 // Only RT_GROUP_CURSOR and RT_GROUP_ICON are used -#if !defined (WIN32) #define RT_CURSOR 1 #define RT_BITMAP 2 #define RT_ICON 3 @@ -94,7 +91,6 @@ namespace Scumm { #define RT_MESSAGELIST 11 #define RT_GROUP_CURSOR 12 #define RT_GROUP_ICON 14 -#endif #define RETURN_IF_BAD_POINTER(r, x) \ if (!check_offset(fi->memory, fi->total_size, fi->file->name(), &(x), sizeof(x))) \ |