# HG changeset patch
# User Faisal Memon <faisal.memon@nokia.com>
# Date 1273152771 -3600
# Node ID 9a3b8b65fc7a63be532d1d42fbda4f8b4bc29929
# Parent  48b924ae719720bcd51c4abfc0bfcfa3c5550c05
Patch 2 to update adaptation hby file to pull in openwf_ref.iby and report the setting OPENWFCLIB_DRV.  Fix window server iby file to not use gce.iby to avoid missing file problem.  Fix typo in the export for minigui_syborg.

diff -r 48b924ae7197 -r 9a3b8b65fc7a graphicsutils/commongraphicsheaders/rom/graphics_adaptation.hby
--- a/graphicsutils/commongraphicsheaders/rom/graphics_adaptation.hby	Thu May 06 11:31:11 2010 +0100
+++ b/graphicsutils/commongraphicsheaders/rom/graphics_adaptation.hby	Thu May 06 14:32:51 2010 +0100
@@ -133,6 +133,13 @@
 	#       define OPENWFCLIB_DRV <openwfc_ref.iby>
 	#   endif
 	#endif
+
+    #ifdef SYMBIAN_GRAPHICS_USE_OPENWF
+    #   ifndef OPENWFCLIB_DRV
+    #       define OPENWFCLIB_DRV <openwfc_ref.iby>
+    #   endif
+    #endif
+
 	
 #elif SYMBIAN_GRAPHICS_ADAPTATION == SGA_MBX
 	// Imagination's MBX drivers used as default
@@ -237,5 +244,6 @@
 REM "DIRECTGDI DRV"        : DIRECTGDI_DRV 
 REM "FBSRASTERIZER DRV"    : FBSRASTERIZER_DRV 
 REM "SRGREOURCE DRV"       : SGRESOURCE_DRV 
+REM "OPENWFCLIB_DRV"       : OPENWFCLIB_DRV
 
 #endif  // __GRAPHICS_ADAPTATION_HBY__
diff -r 48b924ae7197 -r 9a3b8b65fc7a windowing/windowserver/group/wserv.iby
--- a/windowing/windowserver/group/wserv.iby	Thu May 06 11:31:11 2010 +0100
+++ b/windowing/windowserver/group/wserv.iby	Thu May 06 14:32:51 2010 +0100
@@ -24,9 +24,13 @@
 file=ABI_DIR\BUILD_DIR\ws32_nga.dll 	System\Libs\Ws32.dll
 file=ABI_DIR\BUILD_DIR\remotegc_nga.dll	System\Libs\remotegc.dll 
 file=ABI_DIR\BUILD_DIR\wsgraphicdrawer_nga.dll	System\Libs\WsGraphicDrawer.dll
-#ifndef SYMBIAN_GRAPHICS_USE_OPENWF 
+
+#if defined(SYMBIAN_GRAPHICS_USE_OPENWF) && !defined(SYMBIAN_GRAPHICS_USE_OPENWF_MIGRATION)
+REM Pure OpenWF implementation, so skipping proprietary compositor
+#else
 #include <gce.iby>
 #endif
+
 #include <wserv_std_plugins.iby>
 //wserv calls eglReleaseThread() on exit
 #include <egl.iby>
diff -r 48b924ae7197 -r 9a3b8b65fc7a windowing/windowserver/minigui/group/bld.inf
--- a/windowing/windowserver/minigui/group/bld.inf	Thu May 06 11:31:11 2010 +0100
+++ b/windowing/windowserver/minigui/group/bld.inf	Thu May 06 14:32:51 2010 +0100
@@ -21,5 +21,5 @@
 minigui.oby						/epoc32/rom/include/minigui.oby
 wsini_minigui.ini				z:/
 minigui-stripped.oby            /epoc32/rom/include/minigui-stripped.oby
-minugui_syborg.oby              /epoc32/rom/include/minigui_syborg.oby
+minigui_syborg.oby              /epoc32/rom/include/minigui_syborg.oby
 wsini_minigui-stripped.ini		z:/