# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1268237333 0
# Node ID 34cd6bf038acf18dca9ab075dc89e8f285a9ff3e
# Parent  b6935a90ca648413511d8cd71ed956b85269da1c
Very rough additions to get baseport building after the header reorganisation. Original hardcoded systeminclude paths still left in.

diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/ethernet/pdd/enet.mmp
--- a/baseport/syborg/ethernet/pdd/enet.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/ethernet/pdd/enet.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -22,6 +22,7 @@
 TARGETTYPE		pdd
 ROMTARGET       ethernet.pdd
 
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 SYSTEMINCLUDE	/epoc32/include/drivers
 SYSTEMINCLUDE	AsspNKernIncludePath
 SOURCEPATH	    .
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/monitor/monap.mmp
--- a/baseport/syborg/monitor/monap.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/monitor/monap.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -22,6 +22,7 @@
 
 TARGET			VariantTarget(exmondebug,dll)
 
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 SYSTEMINCLUDE	/epoc32/include/drivers
 SYSTEMINCLUDE   ../serial
 
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/serial/serial.mmp
--- a/baseport/syborg/serial/serial.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/serial/serial.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -21,6 +21,7 @@
 TARGET			VariantTarget(eserial,pdd)
 TARGETTYPE		pdd
 
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 SYSTEMINCLUDE	/epoc32/include/drivers
 SYSTEMINCLUDE	AsspNKernIncludePath
 
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/soundsc/soundsc.mmp
--- a/baseport/syborg/soundsc/soundsc.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/soundsc/soundsc.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -17,6 +17,7 @@
 #include		"../variant.mmh"
 #include		"kernel/kern_ext.mmh"
 
+SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
 SYSTEMINCLUDE		/epoc32/include/drivers
 
 
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/svphostfs/svphostfs.mmp
--- a/baseport/syborg/svphostfs/svphostfs.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/svphostfs/svphostfs.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -22,6 +22,7 @@
 LIBRARY        euser.lib efsrv.lib efile.lib hal.lib
 SYSTEMINCLUDE  inc	
 SYSTEMINCLUDE  /epoc32/include 
+OS_LAYER_SYSTEMINCLUDE
 
 CAPABILITY		DISKADMIN ALLFILES
 VENDORID 0x70000001
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/svphostfs/svphostfsdriver.mmp
--- a/baseport/syborg/svphostfs/svphostfsdriver.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/svphostfs/svphostfsdriver.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -24,6 +24,7 @@
 systeminclude		inc
 systeminclude		../svpplatform/libfdt
 systeminclude 		/epoc32/include/stdapis
+OS_LAYER_LIBC_SYSTEMINCLUDE
 
 target			VariantTarget(svphostfsdriver,ldd)
 linkas			svphostfsdriver.ldd
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/svphostfs/svphostfsstart.mmp
--- a/baseport/syborg/svphostfs/svphostfsstart.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/svphostfs/svphostfsstart.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -22,6 +22,7 @@
 LIBRARY        euser.lib efsrv.lib efile.lib hal.lib
 SYSTEMINCLUDE  inc	
 SYSTEMINCLUDE  /epoc32/include 
+OS_LAYER_SYSTEMINCLUDE
 
 CAPABILITY		DISKADMIN ALLFILES
 VENDORID 0x70000001
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/svphostfs/svphostfsy.mmp
--- a/baseport/syborg/svphostfs/svphostfsy.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/svphostfs/svphostfsy.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -24,6 +24,7 @@
 
 SYSTEMINCLUDE	inc	
 SYSTEMINCLUDE	/epoc32/include 
+OS_LAYER_SYSTEMINCLUDE
 
 LIBRARY			efsrv.lib euser.lib hal.lib
 LIBRARY			efile.lib
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/svpplatform/fdt.mmp
--- a/baseport/syborg/svpplatform/fdt.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/svpplatform/fdt.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -20,6 +20,7 @@
 
 systeminclude 		libfdt
 systeminclude 		/epoc32/include/stdapis
+OS_LAYER_LIBC_SYSTEMINCLUDE
 
 sourcepath		libfdt
 
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/svpsnapdriver/snapapp.mmp
--- a/baseport/syborg/svpsnapdriver/snapapp.mmp	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/svpsnapdriver/snapapp.mmp	Wed Mar 10 16:08:53 2010 +0000
@@ -20,7 +20,7 @@
 SOURCEPATH	   src
 SOURCE         snapapp.cpp rsvpsnapdriver.cpp
 LIBRARY        euser.lib efsrv.lib
-SYSTEMINCLUDE  /epoc32/include 
+OS_LAYER_SYSTEMINCLUDE  
 
 CAPABILITY		TCB DISKADMIN ALLFILES
 VENDORID 0x70000001
diff -r b6935a90ca64 -r 34cd6bf038ac baseport/syborg/variant.mmh
--- a/baseport/syborg/variant.mmh	Mon Mar 08 18:45:03 2010 +0000
+++ b/baseport/syborg/variant.mmh	Wed Mar 10 16:08:53 2010 +0000
@@ -15,6 +15,8 @@
 *
 */
 
+#include <platform_paths.hrh>
+
 //macro   __CPU_ARM926J__
 //#define __CPU__ ARM926EJ-S
 
@@ -119,6 +121,11 @@
 systeminclude	/epoc32/include/memmodel/epoc/multiple
 systeminclude	/epoc32/include/memmodel/epoc/multiple/arm
 
+SYMBIAN_BASE_SYSTEMINCLUDE(memmodel/epoc/mmubase)
+SYMBIAN_BASE_SYSTEMINCLUDE(memmodel/epoc/multiple)
+SYMBIAN_BASE_SYSTEMINCLUDE(memmodel/epoc/multiple/arm)
+OS_LAYER_SYSTEMINCLUDE
+
 systeminclude	../../../../os/kernelhwsrv/driversupport/socassp/interface
 
 // Uncomment for T_USERCOMDEB test