diff options
| author | Lars Persson | 2006-06-10 20:30:21 +0000 |
|---|---|---|
| committer | Lars Persson | 2006-06-10 20:30:21 +0000 |
| commit | 55a13866a430811c8e8731d4ae03b25cc171a4ad (patch) | |
| tree | 46d3851956572fe88ad7f9685645f05966618083 | |
| parent | a563efff1e4a570733f76c60a2942c4cf2bca982 (diff) | |
| download | scummvm-rg350-55a13866a430811c8e8731d4ae03b25cc171a4ad.tar.gz scummvm-rg350-55a13866a430811c8e8731d4ae03b25cc171a4ad.tar.bz2 scummvm-rg350-55a13866a430811c8e8731d4ae03b25cc171a4ad.zip | |
Symbian port build updates for S60V3 and UIQ3
svn-id: r23015
| -rw-r--r-- | backends/symbian/UIQ3/scummvm_loc.rss | 1 | ||||
| -rw-r--r-- | backends/symbian/src/ScummApp.cpp | 2 | ||||
| -rw-r--r-- | backends/symbian/src/main_features.inl | 4 | ||||
| -rw-r--r-- | backends/symbian/src/portdefs.h | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/backends/symbian/UIQ3/scummvm_loc.rss b/backends/symbian/UIQ3/scummvm_loc.rss index e2070a74a9..1b068a1c2c 100644 --- a/backends/symbian/UIQ3/scummvm_loc.rss +++ b/backends/symbian/UIQ3/scummvm_loc.rss @@ -1,4 +1,5 @@ #include <AppInfo.rh> +#include <Qikon.hrh> // This file localise the applications icons and caption RESOURCE LOCALISABLE_APP_INFO diff --git a/backends/symbian/src/ScummApp.cpp b/backends/symbian/src/ScummApp.cpp index 07966b4cf5..4315c15065 100644 --- a/backends/symbian/src/ScummApp.cpp +++ b/backends/symbian/src/ScummApp.cpp @@ -27,7 +27,7 @@ #define _PAGESIZE_ 0x1000 -#if defined (__WINS__) && !defined (__SERIES60_30__) +#if defined (__WINS__) && !defined (__SERIES60_30__) && !defined (UIQ3) extern "C" int _chkstk(int /*a*/) { _asm { push ecx diff --git a/backends/symbian/src/main_features.inl b/backends/symbian/src/main_features.inl index 906a890925..2e0b008e68 100644 --- a/backends/symbian/src/main_features.inl +++ b/backends/symbian/src/main_features.inl @@ -60,3 +60,7 @@ #ifndef DISABLE_LURE "Lure " #endif +#ifndef DISABLE_AGI + "AGI " +#endif + diff --git a/backends/symbian/src/portdefs.h b/backends/symbian/src/portdefs.h index c31fe8caa9..303fde726d 100644 --- a/backends/symbian/src/portdefs.h +++ b/backends/symbian/src/portdefs.h @@ -122,7 +122,9 @@ #define snprintf scumm_snprintf #define vsnprintf scumm_vsnprintf - +#else // GCCE and the rest + #define snprintf(buf,len,args...) sprintf(buf,args) + #define vsnprintf(buf,len,format,valist) vsprintf(buf,format,valist) #endif // somehow nobody has this function... |