diff options
| author | Paweł Kołodziejski | 2009-02-15 10:04:29 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2009-02-15 10:04:29 +0000 |
| commit | 25aaf973006f1b7d5d7d373bb12007b2e5b7c11e (patch) | |
| tree | 44b45e0274d7be8fe8248b289b50e9072f46b55c | |
| parent | 311344b4451894120fa4688e431c67d5f08bd2fe (diff) | |
| download | scummvm-rg350-25aaf973006f1b7d5d7d373bb12007b2e5b7c11e.tar.gz scummvm-rg350-25aaf973006f1b7d5d7d373bb12007b2e5b7c11e.tar.bz2 scummvm-rg350-25aaf973006f1b7d5d7d373bb12007b2e5b7c11e.zip | |
include win32 build too
svn-id: r38210
| -rw-r--r-- | engines/sci/engine/scriptdebug.c | 8 | ||||
| -rw-r--r-- | engines/sci/scicore/tools.c | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/engines/sci/engine/scriptdebug.c b/engines/sci/engine/scriptdebug.c index 36d80c01c8..c5e789f842 100644 --- a/engines/sci/engine/scriptdebug.c +++ b/engines/sci/engine/scriptdebug.c @@ -36,17 +36,17 @@ #include "sci/include/sci_widgets.h" #include "sci/include/reg_t_hashmap.h" +#ifdef _MSC_VER +# include <mmsystem.h> +#endif + #ifdef _WIN32 # include <windows.h> # include <io.h> -#endif - # ifdef sleep # undef sleep # endif -#ifdef _MSC_VER -# include <mmsystem.h> # define sleep(x) \ do { \ if (x == 0) { \ diff --git a/engines/sci/scicore/tools.c b/engines/sci/scicore/tools.c index 802a4f9db1..0653e8d21e 100644 --- a/engines/sci/scicore/tools.c +++ b/engines/sci/scicore/tools.c @@ -38,6 +38,13 @@ # include <mmsystem.h> # include <sys/types.h> # include <sys/stat.h> +#endif + +#ifdef _WIN32 +# include <windows.h> + +void usleep (long usec); + # ifdef sleep # undef sleep # endif @@ -54,13 +61,8 @@ fprintf(stderr, "timeEndPeriod(1) failed\n"); \ } \ } while (0); -#else -#ifdef _WIN32 -# include <windows.h> -# include <win32/usleep.h> -# include <win32/sci_win32.h> -#endif #endif + #if !defined(HAVE_FNMATCH) && !defined(_MSC_VER) # include <beos/fnmatch.h> #endif |