* Start of generic key configuration support for ScummVM

* Moved KeyConfigDialog, key from WinCE to gui
* Updated wince code to inherit and use new GUI::Keys and launch new dialog
* New definition SMALL_SCREEN_DEVICE when keysdialog should be inittialized from options.cpp
* Added new function to SDL\Events that handles key remapping.  LINUPY & QTOPIA remapping moved to that function. SymbianOs.cpp overrides this function to enable key remapping to events
* Compiled VC6++ project. This with warnings and errors, but NOT in the changed code. (SAGA,KYRA)
* Compiled using WCE tools 3 for X86 target and running Scummvm in emulator to test
* Compiled with UIQ target. The rest Symbian platforms might require further configuration to operate properly
* Actor.h in Saga now compiles for default VC6 setting.
* Aspect.cpp does not compile in VC6/WCE due to template problems with the kFastAndNiceAspectMode setting.
* Changed order of creation of gamedetector and mainsystem in Main.cpp
* If anything does not compile, or is totally out of order, please revert changes.

svn-id: r18498

1 files changed, 2 insertions, 2 deletions

diff --git a/backends/epoc/ScummApp.h b/backends/epoc/ScummApp.h
index af44952b16..eab91c736a 100644
--- a/backends/epoc/ScummApp.h
+++ b/backends/epoc/ScummApp.h
@@ -27,7 +27,7 @@
 #include <eikapp.h>
 #include <e32base.h>
 #include <sdlapp.h>
-#if!defined (__AVKON_ELAF__) && !defined(S60)
+#ifdef EPOC_AS_APP
 #include "ECompXL.h"
 #endif
 
@@ -37,7 +37,7 @@ public:
 	~CScummApp();
 
 	TUid AppDllUid() const;
-#if!defined (__AVKON_ELAF__) && !defined(S60)
+#ifdef EPOC_AS_APP
 	TECompXL    iECompXL;        
 #endif
 };