diff -r 09b1ac925e3f -r 03674e5abf46 securitydialogs/SecUi/group/SecUi.mmp
--- a/securitydialogs/SecUi/group/SecUi.mmp	Tue Aug 31 16:04:40 2010 +0300
+++ b/securitydialogs/SecUi/group/SecUi.mmp	Wed Sep 01 12:19:59 2010 +0100
@@ -20,8 +20,6 @@
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
 
-SYSTEMINCLUDE   /epoc32/include/mw/hb/hbcore 
-
 TARGET  secui.dll
 TARGETTYPE  dll
 UID 0x1000006C 0x100058ED
@@ -42,27 +40,81 @@
 
 MW_LAYER_SYSTEMINCLUDE ../../../inc 
 
-SOURCEPATH ../Src
+
+#ifdef __PROTOCOL_CDMA
+
+    SOURCEPATH ../Cdma/Src
+    SOURCE  SecUiSecuritySettingsCdma.cpp
+    SOURCE  SecUiSecurityHandlerCdma.cpp
+    SOURCE  SecUiObsStartterCdma.cpp
+    SOURCE  SecUiAutoLockSettingPageCdma.cpp
+    SOURCE  SecUiSystemLockCdma.cpp
+
+    SOURCEPATH ../Src
+    SOURCE  SecUi.cpp
+    SOURCE  SecUiCodeQueryDialog.cpp
+    SOURCE  SecUiCodeQueryControl.cpp
+    SOURCE  SecUiManualSecuritySettings.cpp
+    SOURCE  SecUiWait.cpp
+
+
+    library EUSER.LIB BAFL.LIB CONE.LIB
+    library EIKCORE.LIB EIKCOCTL.LIB
+    library avkon.lib  eikdlg.lib 
+    library etel.lib etelmm.lib
+    library eikctl.lib 
+    library ws32.lib commonengine.lib
+    library efsrv.lib 
+	LIBRARY centralrepository.lib
+	LIBRARY aknNotifierWrapper.lib
+    library customapi.lib
+    library securityclient.lib  //Security Engine
+    library apparc.lib //For starting application in secuiobsstartter
+
+   LIBRARY SCPClient.lib // SCP server
+
+#else //If GSM:
+
+
+    SOURCEPATH ../Src
 
-SOURCE  ../Src/SecUi.cpp
-SOURCE  ../Src/SecUiCodeQueryDialog.cpp
-SOURCE  ../Src/SecUiSecuritySettings.cpp
-SOURCE  ../Src/SecUiSecurityHandler.cpp
-SOURCE  ../Src/SecUiAutoLockSettingPage.cpp
-SOURCE  ../Src/SecUiObsStartter.cpp
-SOURCE  ../Src/SecUiManualSecuritySettings.cpp
-SOURCE  ../Src/SecUiSystemLock.cpp
-SOURCE  ../Src/SecUiWait.cpp
-SOURCE  ../Src/SecQueryUi.cpp
+    SOURCE  ../Src/SecUi.cpp
+    SOURCE  ../Src/SecUiCodeQueryDialog.cpp
+    SOURCE  ../Src/SecUiSecuritySettings.cpp
+    SOURCE  ../Src/SecUiSecurityHandler.cpp
+    SOURCE  ../Src/SecUiCodeQueryControl.cpp
+    SOURCE  ../Src/SecUiAutoLockSettingPage.cpp
+    SOURCE  ../Src/SecUiObsStartter.cpp
+    SOURCE  ../Src/SecUiManualSecuritySettings.cpp
+    SOURCE  ../Src/SecUiSystemLock.cpp
+    SOURCE  ../Src/SecUiWait.cpp
+    SOURCE  ../Src/SecUiLockObserver.cpp
+#ifdef RD_REMOTELOCK
+    SOURCE  ../Src/SecUiRemoteLockSettingPage.cpp
+#endif    
 
-// library avkon.lib  eikdlg.lib 
-library     euser.lib
-library     etel.lib etelmm.lib
-library     commonengine.lib
-library     customapi.lib
-library     rlocksettings.lib 
-LIBRARY     scpclient.lib // SCP server         
-LIBRARY			centralrepository.lib
+    library     euser.lib bafl.lib cone.lib
+    library     eikcore.lib eikcoctl.lib
+    library     avkon.lib  eikdlg.lib 
+    library     etel.lib etelmm.lib
+    library     eikctl.lib 
+    library     ws32.lib commonengine.lib
+    library     efsrv.lib 
+    library     eiksrvui.lib
+    library     customapi.lib
+    LIBRARY     starterclient.lib       //use of Starter to remove splash screen
+    library     sysutil.lib
+    library     estor.lib
+
+#ifdef RD_REMOTELOCK
+    library     rlocksettings.lib 
+#endif    
+
+
+   LIBRARY      scpclient.lib // SCP server         
+	LIBRARY centralrepository.lib
+	LIBRARY aknnotifierwrapper.lib
+#endif //__PROTOCOL_CDMA
 
 // Modified by build team
 #if defined(WINSCW)
@@ -71,11 +123,6 @@
 LIBRARY                 featmgr.lib
 LIBRARY aknnotify.lib
 
-LIBRARY HbCore.lib
-LIBRARY HbWidgets.lib
-LIBRARY lockclient.lib 
-LIBRARY phoneclient.lib
-
 SMPSAFE
 
 // end of file