diff -r 2d65c2f76d7b -r 4a8fed1c0ef6 bsptemplate/asspandvariant/template_variant/bld.inf --- a/bsptemplate/asspandvariant/template_variant/bld.inf Tue Feb 02 01:24:03 2010 +0200 +++ b/bsptemplate/asspandvariant/template_variant/bld.inf Sat Feb 20 00:10:51 2010 +0200 @@ -108,12 +108,35 @@ // PRJ_EXTENSIONS -start extension base/bootstrap + +#ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter + +start extension base.bootstrap bootstrap #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 NAME _template_bootrom +option CPU arm +option MEMMODEL Multiple +option SOURCES ./bootstrap/template.s +option EXTRA_SRC_PATH ./bootstrap +option INCLUDES ./config.inc +option E32PATH ../../../kernel/eka/../. + +end + +#else // !SBSV2 + +start extension base/bootstrap bootstrap + +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +option INC_PATH $(EPOCROOT)epoc32/include +#else +option INC_PATH $(EPOCROOT)epoc32/include/platform #endif option NAME _template_bootrom @@ -126,3 +149,4 @@ end +#endif // !SBSV2