# HG changeset patch # User William Roberts # Date 1271236945 -3600 # Node ID 97dc1b484861b7340e0e0428a9e730bbd6fecef5 # Parent 11e392ea2e632e86ca3fff85b805b6075b827196# Parent 62a56fb37080c0be38599dd0ea31d778e62e7efb Merge hal.mmp fix into the correct branch diff -r 11e392ea2e63 -r 97dc1b484861 baseport/syborg/hal/hal.mmp --- a/baseport/syborg/hal/hal.mmp Tue Apr 06 18:41:44 2010 +0100 +++ b/baseport/syborg/hal/hal.mmp Wed Apr 14 10:22:25 2010 +0100 @@ -28,7 +28,7 @@ SOURCEPATH /epoc32/build/generatedcpp/hal SOURCE VariantTarget(values,cpp) VariantTarget(config,cpp) -SYSTEMINCLUDE /epoc32/include /epoc32/include/kernel +OS_LAYER_SYSTEMINCLUDE LIBRARY euser.lib DEFFILE ../../../../../os/kernelhwsrv/halservices/hal/~/hal.def