[Scummvm-cvs-logs] SF.net SVN: scummvm: [23015] scummvm/trunk/backends/symbian/src

[anotherguest at users.sourceforge.net]

Revision: 23015
Author:   anotherguest
Date:     2006-06-10 13:30:21 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23015&view=rev

Log Message:
-----------
Symbian port build updates for S60V3 and UIQ3

Modified Paths:
--------------
    scummvm/trunk/backends/symbian/UIQ3/scummvm_loc.rss
    scummvm/trunk/backends/symbian/src/ScummApp.cpp
    scummvm/trunk/backends/symbian/src/main_features.inl
    scummvm/trunk/backends/symbian/src/portdefs.h
Modified: scummvm/trunk/backends/symbian/UIQ3/scummvm_loc.rss
===================================================================
--- scummvm/trunk/backends/symbian/UIQ3/scummvm_loc.rss	2006-06-10 18:11:34 UTC (rev 23014)
+++ scummvm/trunk/backends/symbian/UIQ3/scummvm_loc.rss	2006-06-10 20:30:21 UTC (rev 23015)
@@ -1,4 +1,5 @@
 #include <AppInfo.rh>
+#include <Qikon.hrh>
 
 // This file localise the applications icons and caption
 RESOURCE LOCALISABLE_APP_INFO

Modified: scummvm/trunk/backends/symbian/src/ScummApp.cpp
===================================================================
--- scummvm/trunk/backends/symbian/src/ScummApp.cpp	2006-06-10 18:11:34 UTC (rev 23014)
+++ scummvm/trunk/backends/symbian/src/ScummApp.cpp	2006-06-10 20:30:21 UTC (rev 23015)
@@ -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 

Modified: scummvm/trunk/backends/symbian/src/main_features.inl
===================================================================
--- scummvm/trunk/backends/symbian/src/main_features.inl	2006-06-10 18:11:34 UTC (rev 23014)
+++ scummvm/trunk/backends/symbian/src/main_features.inl	2006-06-10 20:30:21 UTC (rev 23015)
@@ -60,3 +60,7 @@
 #ifndef DISABLE_LURE
 	"Lure "
 #endif
+#ifndef DISABLE_AGI
+	"AGI "
+#endif
+

Modified: scummvm/trunk/backends/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/symbian/src/portdefs.h	2006-06-10 18:11:34 UTC (rev 23014)
+++ scummvm/trunk/backends/symbian/src/portdefs.h	2006-06-10 20:30:21 UTC (rev 23015)
@@ -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...


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