--- a/graphicscomposition/openwfcompositionengine/group/bld.inf	Thu May 06 18:24:48 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/group/bld.inf	Thu May 06 19:17:55 2010 +0100
@@ -23,7 +23,6 @@
 
 PRJ_MMPFILES
 openwfc.mmp
-openwfchwref.mmp
 openwfchwsyborg.mmp
 
 PRJ_TESTMMPFILES

--- a/graphicscomposition/openwfcompositionengine/group/openwfc.mmh	Thu May 06 18:24:48 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc.mmh	Thu May 06 19:17:55 2010 +0100
@@ -14,11 +14,11 @@
 // Common project include header for OpenWFC DLL implementations
 // The need for this common header is so that three different versions of the
 // implementation can be generated:
-//   1.  WINSCW version (libWFC.dll)
-//   2.  Nokia ARM Reference Boards version (libwfchwref.dll)
-//   3.  Symbian Foundation Syborg Virtual Platform version (libwfchwsyborg.dll)
+//   1.  WINSCW version
+//   2.  ARM version for Nokia Reference Boards
+//   3.  Syborg version for Symbian Foundation SVP Reference Platform
 //
-//  Note for hardware platforms, the dll is aliased to libWFC.dll
+//  Note for syborg platform, the dll is aliased to libWFC.dll via rombuild
 //
 //
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc.mmp	Thu May 06 19:17:55 2010 +0100
@@ -0,0 +1,28 @@
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// OpenWFC Sample Implementation
+//
+//
+
+
+//macros to enable filtering debug log output.
+//DEBUG_LOG must also be defined to enable logging
+//(automatic if _DEBUG is defined, and DEBUG_DONOT_LOG is not defined)
+MACRO DEBUG_DONOT_LOG
+//MACRO DEBUG_LOG_FUNCTION=WFC_Element_
+//MACRO DEBUG_LOG_FILE=owfnotifications.c
+
+#include "openwfc.mmh"
+
+TARGET                 libWFC.dll

--- a/graphicscomposition/openwfcompositionengine/group/openwfc_ref.iby	Thu May 06 18:24:48 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc_ref.iby	Thu May 06 19:17:55 2010 +0100
@@ -19,12 +19,11 @@
 #include <egl.iby>
 #include <openwfc_support.iby>
 
-#ifndef __SYBORG__
-file=ABI_DIR\BUILD_DIR\libwfchwref.dll		\sys\bin\libwfchwref.dll
-alias \sys\bin\libwfchwref.dll				\sys\bin\libWFC.dll
+#ifdef __SYBORG__
+file=ABI_DIR\BUILD_DIR\libwfchwsyborg.dll      \sys\bin\libwfchwsyborg.dll
+alias \sys\bin\libwfchwsyborg.dll                      \sys\bin\libWFC.dll
 #else
-file=ABI_DIR\BUILD_DIR\libwfchwsyborg.dll	\sys\bin\libwfchwsyborg.dll
-alias \sys\bin\libwfchwsyborg.dll			\sys\bin\libWFC.dll
+file=ABI_DIR\BUILD_DIR\libWFC.dll                      \sys\bin\libWFC.dll
 #endif
 
 #endif // __OPENWFC_REF_IBY__

--- a/graphicscomposition/openwfcompositionengine/group/openwfchwref.mmp	Thu May 06 18:24:48 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// OpenWFC Sample Implementation Hardware Reference
-// 
-//
-
-
-//macros to enable filtering debug log output.
-//DEBUG_LOG must also be defined to enable logging 
-//(automatic if _DEBUG is defined, and DEBUG_DONOT_LOG is not defined)
-MACRO DEBUG_DONOT_LOG
-//MACRO DEBUG_LOG_FUNCTION=WFC_Element_
-//MACRO DEBUG_LOG_FILE=owfnotifications.c
-
-#include "openwfc.mmh"
-
-TARGET                 libwfchwref.dll