--- a/calendarui/regionalplugins/lunarchinese/lunarchinese.pro	Fri Apr 16 14:57:40 2010 +0300
+++ b/calendarui/regionalplugins/lunarchinese/lunarchinese.pro	Mon May 03 12:30:32 2010 +0300
@@ -14,54 +14,15 @@
 # Description: Project file for LunarChinese plugin module.
 #
 
-
 TEMPLATE = lib
 CONFIG += hb
 TARGET = calenlunarchineseplugin
-DEPENDPATH +=  ./inc ./src ./data
+
+DEPENDPATH +=  ./inc ./src
 INCLUDEPATH +=  ./inc 
 INCLUDEPATH += ../inc ../../inc
-INCLUDEPATH += /epoc32/include/ecom
-INCLUDEPATH += /orbit/include
-INCLUDEPATH += /epoc32/include/osextensions/stdapis/stlport \
-						   /sf/mw/hb/include/hbservices \
-						   /sf/mw/hb/include/hbservices/private \
-						   /sf/mw/hb/include/hbcore \
-						   /sf/mw/hb/hbcore/private
-
 
 
-BLD_INF_RULES.prj_exports += \
-"./data/solaritems  /epoc32/data/z/data/solaritems" 
-
-# MMP Rules
-mmpRules = \
-"$${LITERAL_HASH}include <platform_paths.hrh>" \
-#"$${LITERAL_HASH}include <../inc/CalenRegionalPluginUids.h>" \
-"$${LITERAL_HASH}include <data_caging_paths.hrh>" \
-"APP_LAYER_SYSTEMINCLUDE" \
-	\
-"SOURCEPATH      ./data" \
-"START RESOURCE hb_calenlunarchineseplugin.rss" \
-"TARGET hb_calenlunarchineseplugin.rsc" \
-"TARGETPATH ECOM_RESOURCE_DIR" \
-"LANGUAGE_IDS" \
-"END" \
-\
-"START RESOURCE  ./data/calenlunarchineseplugindata.rss" \
-"HEADER" \
-"TARGETPATH      RESOURCE_FILES_DIR" \
-"LANGUAGE_IDS" \
-"END"
-
-MMP_RULES +=mmpRules
-symbian: {
-
-TARGET.UID2 = 0x10009D8D #SYMBIAN_ECOM_PLUGIN_UID 
-TARGET.UID3 = 0x102823A8 #CALENLUNARCHINESEPLUGIN_DLL_UID 
-TARGET.CAPABILITY = CAP_ECOM_PLUGIN 
-
-}
 # Input
 HEADERS += ./inc/CalenLunarChinesePlugin.h 
 
@@ -92,4 +53,49 @@
 		-lavkon \
             -lcalenregionalutil
 
+symbian: {
+
+INCLUDEPATH += /epoc32/include/ecom \
+				../loc
+
+TARGET.UID2 = 0x10009D8D #SYMBIAN_ECOM_PLUGIN_UID 
+TARGET.UID3 = 0x2002EA3C #CALENLUNARCHINESEPLUGIN_DLL_UID 
+TARGET.CAPABILITY = CAP_ECOM_PLUGIN
+TARGET.EPOCALLOWDLLDATA = 1
+
+BLD_INF_RULES.prj_exports += \
+"./data/solaritems  /epoc32/data/z/private/10005901/solaritems" \
+"./data/solaritems  /epoc32/release/winscw/udeb/z/private/10005901/solaritems" \
+"./data/solaritems  /epoc32/release/winscw/urel/z/private/10005901/solaritems" 
+
+# MMP Rules
+mmpRules = \
+"$${LITERAL_HASH}include <platform_paths.hrh>" \
+#"$${LITERAL_HASH}include <../inc/CalenRegionalPluginUids.h>" \
+"$${LITERAL_HASH}include <data_caging_paths.hrh>" \
+"APP_LAYER_SYSTEMINCLUDE" \
+ \
+"SOURCEPATH      ./data" \
+"START RESOURCE 2002EA3C.rss" \
+"TARGET calenlunarchineseplugin.rsc" \
+"TARGETPATH ECOM_RESOURCE_DIR" \
+"LANGUAGE_IDS" \
+"END" \
+\
+"START RESOURCE  calenlunarchineseplugindata.rss" \
+"HEADER" \
+"TARGETPATH      RESOURCE_FILES_DIR" \
+"LANGUAGE_IDS" \
+"END"  \
+\
+"TARGETTYPE plugin"
+
+
+MMP_RULES +=mmpRules
+
+MMP_RULES -= "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE"
+
+}
+
+
 # End of file	--Don't remove this.
\ No newline at end of file