diff options
| author | Nicolas Bacca | 2003-04-04 13:14:15 +0000 |
|---|---|---|
| committer | Nicolas Bacca | 2003-04-04 13:14:15 +0000 |
| commit | 9633eb00dd3f048f82de1823f898da351df32b2c (patch) | |
| tree | 2769005ec6498175bf88a8fbf0f98e4184bc7517 | |
| parent | d13a5415a9185eb10fa611935508a3eac9913bc6 (diff) | |
| download | scummvm-rg350-9633eb00dd3f048f82de1823f898da351df32b2c.tar.gz scummvm-rg350-9633eb00dd3f048f82de1823f898da351df32b2c.tar.bz2 scummvm-rg350-9633eb00dd3f048f82de1823f898da351df32b2c.zip | |
Fix compiling issues with Smartphone/HPC builds
svn-id: r6906
| -rw-r--r-- | backends/wince/PocketSCUMM.rc | 7 | ||||
| -rw-r--r-- | backends/wince/newres.h | 2 | ||||
| -rw-r--r-- | backends/wince/portdefs.h | 27 |
3 files changed, 36 insertions, 0 deletions
diff --git a/backends/wince/PocketSCUMM.rc b/backends/wince/PocketSCUMM.rc index 71d7ca85de..7cd915720f 100644 --- a/backends/wince/PocketSCUMM.rc +++ b/backends/wince/PocketSCUMM.rc @@ -7,6 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // + #include "newres.h" ///////////////////////////////////////////////////////////////////////////// @@ -41,12 +42,16 @@ BEGIN "resource.h\0" END +#if _WIN32_WCE >= 300 + 2 TEXTINCLUDE DISCARDABLE BEGIN "#include ""newres.h""\r\n" "\0" END +#endif + 3 TEXTINCLUDE DISCARDABLE BEGIN "\r\n" @@ -55,6 +60,7 @@ END #endif // APSTUDIO_INVOKED +#if _WIN32_WCE >= 300 ///////////////////////////////////////////////////////////////////////////// // @@ -99,6 +105,7 @@ BEGIN TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_OPTIONS, 0, 1, END +#endif ///////////////////////////////////////////////////////////////////////////// // diff --git a/backends/wince/newres.h b/backends/wince/newres.h index a02ab23955..a27a106c5e 100644 --- a/backends/wince/newres.h +++ b/backends/wince/newres.h @@ -41,9 +41,11 @@ #ifndef _INC_WINDOWS #define _INC_WINDOWS #include "winuser.h" // extract from windows header +#if _WIN32_WCE >= 300 #include "winver.h" #endif #endif +#endif #ifdef IDC_STATIC #undef IDC_STATIC diff --git a/backends/wince/portdefs.h b/backends/wince/portdefs.h index ec468ec085..364b7cc168 100644 --- a/backends/wince/portdefs.h +++ b/backends/wince/portdefs.h @@ -23,6 +23,8 @@ #if _WIN32_WCE < 300 +#define _HEAPOK 0 + void *calloc(size_t n, size_t s); int isdigit(int c); int isprint(int c); @@ -35,4 +37,29 @@ void assert( void* expression ); void assert( int expression ); long int strtol(const char *nptr, char **endptr, int base); char *strdup( const char *s); +int _heapchk(); + +#endif + +#ifdef _WIN32_WCE + +void *bsearch(const void *, const void *, size_t, + size_t, int (*x) (const void *, const void *)); +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <io.h> +#include <stdarg.h> +#include <fcntl.h> +#include <conio.h> +#include <malloc.h> +#include <assert.h> +#include <mmsystem.h> +#include <ctype.h> +#include <Winuser.h> +#include <direct.h> + +void drawError(char*); + #endif |