# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572433 0
# Node ID 8b17553ac4e0bb096f88b46a0ad51a25da3e830d
# Parent  991e374445d09e86ecde83442d176c56776338e2# Parent  d17b4c0804b9f1d57d7bb870c9807c7406bd0130
Automatic merge from PDK_3.0.h

diff -r 991e374445d0 -r 8b17553ac4e0 emulator/emulatorbsp/bld.inf
--- a/emulator/emulatorbsp/bld.inf	Mon Mar 08 21:44:28 2010 +0000
+++ b/emulator/emulatorbsp/bld.inf	Sun Mar 14 13:13:53 2010 +0000
@@ -21,7 +21,8 @@
 PRJ_EXPORTS
 
 documentation/wins_ether_drv_howto.txt	/epoc32/engdoc/ethernet/	//
-
+estart/estart_nocaching.txt		/epoc32/release/winscw/udeb/z/sys/data/estart.txt
+estart/estart_nocaching.txt		/epoc32/release/winscw/urel/z/sys/data/estart.txt
 
 inc/variantmediadef.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(wins/variantmediadef.h)		
 variant.mmh						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(wins/variant.mmh)
@@ -76,9 +77,9 @@
 start		extension		base/nand_fbr_offset
 
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-option INC_PATH   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
 #endif
 
 option		SRCDIR			$(EXTENSION_ROOT)/inc
diff -r 991e374445d0 -r 8b17553ac4e0 emulator/emulatorbsp/estart/estart_nocaching.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emulator/emulatorbsp/estart/estart_nocaching.txt	Sun Mar 14 13:13:53 2010 +0000
@@ -0,0 +1,23 @@
+# Copyright (c) 2008-2009 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:
+#
+# This estart.txt file was created in response to the virtual address space problems
+# that were found with the S60 emulator.  It will turn off directory and file caching,
+# thereby saving ~70 MB of virtual address space in the emulator's Windows address space
+
+[FileCache]
+GlobalCacheEnabled OFF
+
+[CacheMemory]
+GlobalCacheMemorySize	0