diff -r e6e3e87d58b4 -r 4df3a095718c creator/group/creator.mmp
--- a/creator/group/creator.mmp	Fri Mar 19 09:29:26 2010 +0200
+++ b/creator/group/creator.mmp	Fri Apr 16 14:59:17 2010 +0300
@@ -15,9 +15,9 @@
 *
 */
 
-
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
+#include "../symbian_version.hrh"
 
 
 TARGET            creator.exe
@@ -65,32 +65,30 @@
 SOURCE            creator_calendarelement.cpp 
 SOURCE            creator_message.cpp 
 SOURCE            creator_messageelement.cpp 
-SOURCE            creator_note.cpp
-SOURCE            creator_noteelement.cpp 
 SOURCE            creator_log.cpp
 SOURCE 			  creator_logelement.cpp 
 SOURCE            creator_file.cpp
 SOURCE 			  creator_fileelement.cpp 
 SOURCE            creator_browser.cpp 
 SOURCE 			  creator_browserelement.cpp 
-SOURCE            creator_imps.cpp
-SOURCE		      creator_impselement.cpp 
 SOURCE            creator_mailbox.cpp
 SOURCE 			  creator_mailboxelement.cpp 
 SOURCE			  creator_landmark.cpp 
 SOURCE 			  creator_landmarkelement.cpp 
-SOURCE 			  creator_phonebookbase.cpp 
 SOURCE 			  creator_contactelement.cpp 
-SOURCE            creator_contactsetcache.cpp 
 SOURCE			  creator_connectionmethodelement.cpp
 SOURCE			  creator_randomdataparser.cpp
+SOURCE			  creator_contactsetcache.cpp
 
-#if defined (__SERIES60_30__) || defined(__SERIES60_31__)
+#if SYMBIAN_VERSION_SUPPORT >= SYMBIAN_4
+  SOURCE			  creator_connectionmethod.cpp
+  SOURCE			  creator_accesspoint.cpp 
+#elif defined (__SERIES60_30__) || defined(__SERIES60_31__)
   SOURCE			  creator_phonebook.cpp
   SOURCE			  creator_accesspoint.cpp 
 #else
-  SOURCE			  creator_virtualphonebook.cpp
   SOURCE			  creator_connectionmethod.cpp
+  SOURCE			  creator_accesspoint.cpp
 #endif  
 
 
@@ -109,12 +107,16 @@
 LIBRARY efsrv.lib
 LIBRARY gsmu.lib
 LIBRARY imcm.lib
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 LIBRARY npdlib.lib
+#endif
 LIBRARY bafl.lib 
 LIBRARY eikcoctl.lib 
 LIBRARY eikctl.lib
 LIBRARY commdb.lib
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 LIBRARY muiu.lib
+#endif
 LIBRARY etext.lib 
 LIBRARY commonengine.lib 
 LIBRARY commonui.lib 
@@ -143,16 +145,23 @@
 LIBRARY fbscli.lib
 LIBRARY bitmaptransforms.lib
 
-#if defined (__SERIES60_30__) || defined(__SERIES60_31__)
+#if SYMBIAN_VERSION_SUPPORT >= SYMBIAN_4
+  LIBRARY apengine.lib
+  LIBRARY cmmanager.lib
+  LIBRARY cmmanagerdatabase.lib
+#elif defined (__SERIES60_30__) || defined(__SERIES60_31__) 
   LIBRARY apengine.lib
   LIBRARY pbkeng.lib
 #else
+	LIBRARY apengine.lib
   LIBRARY cmmanager.lib
   LIBRARY cmmanagerdatabase.lib
   LIBRARY vpbkeng.lib
   LIBRARY pbk2presentation.lib		
 #endif
 
+#if SYMBIAN_VERSION_SUPPORT < SYMBIAN_4
 #ifdef __PRESENCE
-  LIBRARY wvsapsettingsstore.lib
-#endif  
+	LIBRARY wvsapsettingsstore.lib
+#endif
+#endif