Minor updates to the Symbian/S60 port, plus project files that weren't

previously imported. Fixes Bugzilla #433.
libsdl-org · Jul 5, 2007 · c1efd54 · c1efd54
1 parent e7e6202
commit c1efd54
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/README.Symbian b/README.Symbian
@@ -14,19 +14,10 @@ abld build
 
 That produces WINSCW and ARMV5 versions of sdl.dll runtime library 
 and sdl.lib for development. 
+The sdlexe.dll/sdlexe.lib and sdlmain.lib are for easy SDL S60
+integration, please see http://www.mbnet.fi/~mertama/sdl.html
+for further info.
 
-Eaudiolib.lib and dll are generated as well, and must be delivered
-along SDL as it uses it for audio.
-
-There are certain problems with GCC compiler when building for
-target, it may compile or binaries are buggy - please use RVCT
-compiler as it works and produces far more effient code.
-
-Its likely that SDL application should be integrated into S60 
-work and behave well there. So there is CSDL class (sdlepocapi.h)
-to make this easy. If you do porting from other system, then 
-implement a S60 application and use CSDL class, they you may
-not need to modify original SDL code at all!
 
 
 
diff --git a/include/SDL_config_symbian.h b/include/SDL_config_symbian.h
@@ -135,7 +135,7 @@ typedef unsigned long long uint64_t;
 #define HAVE_ATOF 1
 #define HAVE_STRCMP 1
 #define HAVE_STRNCMP 1
-#define HAVE__STRICMP 1
+//#define HAVE__STRICMP 1
 #define HAVE__STRNICMP 1
 #define HAVE_SSCANF 1
 #define HAVE_STDARG_H	1

diff --git a/src/video/symbian/EKA2/dsa.cpp b/src/video/symbian/EKA2/dsa.cpp
@@ -12,7 +12,7 @@ LOCAL_C TInt BytesPerPixel(TDisplayMode aMode)
 
 
 template<class T>
-class CBitmapSurface : public T
+NONSHARABLE_CLASS(CBitmapSurface) : public T
 	{
 public:
 	CBitmapSurface(RWsSession& aSession);
@@ -830,8 +830,9 @@ TInt CDsa::SetPalette(TInt aFirst, TInt aCount, TUint32* aPalette)
 
 
 CDsa::CDsa(RWsSession& aSession) : 
- 	iSession(aSession),
-  	iStateFlags(0)
+ 	iStateFlags(0),
+ 	iSession(aSession)
+
 	{
 //	CActiveScheduler::Add(this);
 	iCFTable[0] = CopyMem;

diff --git a/symbian.zip b/symbian.zip