--- a/videocollection/videocollectionwrapper/videocollectionwrapper.pro	Tue Jun 15 13:09:36 2010 +0100
+++ b/videocollection/videocollectionwrapper/videocollectionwrapper.pro	Thu Jul 22 16:34:17 2010 +0100
@@ -20,9 +20,15 @@
     TARGET.UID2 = 0x1000008D
     TARGET.UID3 = 0x200211FD
     BLD_INF_RULES.prj_exports += "rom/videocollectionwrapper.iby CORE_APP_LAYER_IBY_EXPORT_PATH(videocollectionwrapper.iby)"
-    MMP_RULES += "DEFFILE videocollectionwrapper.def"
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.EPOCALLOWDLLDATA = 1
+    defBlock = \      
+        "$${LITERAL_HASH}if defined(EABI)" \
+        "DEFFILE ../eabi/videocollectionwrapper.def" \
+        "$${LITERAL_HASH}else" \
+        "DEFFILE ../bwins/videocollectionwrapper.def" \
+        "$${LITERAL_HASH}endif"
+    MMP_RULES += defBlock
 }
 CONFIG      += hb qt dll
 DEFINES     += BUILD_VIDEOCOLLECTION_DLL
@@ -75,5 +81,3 @@
         -lestor.dll \
         -lcentralrepository.dll \
         -lflogger.dll
-        
-RESOURCES += data/videocollectionwrapper.qrc