aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNicolas Bacca2002-11-19 08:05:48 +0000
committerNicolas Bacca2002-11-19 08:05:48 +0000
commit80d32ec5e1b075ff655ccf1f33294cd1f6fbfcec (patch)
treed21195912acd50b9901568c49e9353b690cf95f9 /common
parent1a97719ae51eef51536f088cd334503a3c4e5d75 (diff)
downloadscummvm-rg350-80d32ec5e1b075ff655ccf1f33294cd1f6fbfcec.tar.gz
scummvm-rg350-80d32ec5e1b075ff655ccf1f33294cd1f6fbfcec.tar.bz2
scummvm-rg350-80d32ec5e1b075ff655ccf1f33294cd1f6fbfcec.zip
Small Windows CE changes : detect old WinCE as NONSTANDARD_PORT, change __cdecl for these systems, add 2 sampling rates for WinCE due to problems with Smush mixer in 11 kHz
svn-id: r5604
Diffstat (limited to 'common')
-rw-r--r--common/scummsys.h6
-rw-r--r--common/stdafx.h10
-rw-r--r--common/system.h3
3 files changed, 18 insertions, 1 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index e396322ae0..7caa2a2f53 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -68,6 +68,12 @@ const bool true(1), false(0);
#define END_PACK_STRUCTS pack(pop)
#define GCC_PACK
+#if defined(_WIN32_WCE) && _WIN32_WCE < 300
+
+ #define CDECL __cdecl
+
+#endif
+
#elif defined(__MINGW32__)
#define scumm_stricmp stricmp
diff --git a/common/stdafx.h b/common/stdafx.h
index dbd9899dd8..5f2f71ebff 100644
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -2,7 +2,11 @@
* $Id$
*
* $Log$
+ * Revision 1.3 2002/11/19 08:05:46 arisme
+ * Small Windows CE changes : detect old WinCE as NONSTANDARD_PORT, change __cdecl for these systems, add 2 sampling rates for WinCE due to problems with Smush mixer in 11 kHz
+ *
* Revision 1.2 2002/09/22 11:37:53 kirben
+ *
* Remove mention of Windows GDI build
*
* Revision 1.1.1.1 2002/08/21 16:07:23 fingolfin
@@ -58,6 +62,12 @@
#ifndef _STDAFX_H
#define _STDAFX_H
+#if defined(_WIN32_WCE) && _WIN32_WCE < 300
+
+#define NONSTANDARD_PORT
+
+#endif
+
#if defined(NONSTANDARD_PORT)
#include <portdefs.h>
diff --git a/common/system.h b/common/system.h
index d5057f6bfd..5cae9b691d 100644
--- a/common/system.h
+++ b/common/system.h
@@ -208,7 +208,8 @@ enum {
enum {
#ifdef _WIN32_WCE
- SAMPLES_PER_SEC = 11025
+ SAMPLES_PER_SEC_OLD = 11025,
+ SAMPLES_PER_SEC_NEW = 22050
#else
SAMPLES_PER_SEC = 22050
#endif