[Scummvm-cvs-logs] SF.net SVN: scummvm:[38210] scummvm/trunk/engines/sci

[aquadran at users.sourceforge.net]

Revision: 38210
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38210&view=rev
Author:   aquadran
Date:     2009-02-15 10:04:29 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
include win32 build too

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/scriptdebug.c
    scummvm/trunk/engines/sci/scicore/tools.c

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.c
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.c	2009-02-15 09:56:47 UTC (rev 38209)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.c	2009-02-15 10:04:29 UTC (rev 38210)
@@ -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) { \

Modified: scummvm/trunk/engines/sci/scicore/tools.c
===================================================================
--- scummvm/trunk/engines/sci/scicore/tools.c	2009-02-15 09:56:47 UTC (rev 38209)
+++ scummvm/trunk/engines/sci/scicore/tools.c	2009-02-15 10:04:29 UTC (rev 38210)
@@ -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


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