equal
deleted
inserted
replaced
108 // Call the makefile to build the bootstrap |
108 // Call the makefile to build the bootstrap |
109 // |
109 // |
110 |
110 |
111 PRJ_EXTENSIONS |
111 PRJ_EXTENSIONS |
112 |
112 |
|
113 #if 0 // Removing changes associated with introduction of bootstrap.flm - see Bug 2149 |
113 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter |
114 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter |
114 |
115 |
115 start extension base.bootstrap bootstrap |
116 start extension base.bootstrap bootstrap |
|
117 |
116 |
118 |
117 option NAME _template_bootrom |
119 option NAME _template_bootrom |
118 option CPU arm |
120 option CPU arm |
119 option MEMMODEL Multiple |
121 option MEMMODEL Multiple |
120 option SOURCES ./bootstrap/template.s |
122 option SOURCES ./bootstrap/template.s |
123 option E32PATH ../../../kernel/eka/../. |
125 option E32PATH ../../../kernel/eka/../. |
124 |
126 |
125 end |
127 end |
126 |
128 |
127 #else // !SBSV2 |
129 #else // !SBSV2 |
|
130 #endif // more workaround - close the #ifdef SBSV2 here, to regain the other bit |
|
131 #endif // first part of workaround - close the #ifdef 0 |
|
132 |
128 |
133 |
129 start extension base/bootstrap bootstrap |
134 start extension base/bootstrap bootstrap |
130 |
135 |
131 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
136 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
132 option INC_PATH $(EPOCROOT)epoc32/include |
137 option INC_PATH $(EPOCROOT)epoc32/include |
142 option INCLUDES $(EXTENSION_ROOT)/config.inc |
147 option INCLUDES $(EXTENSION_ROOT)/config.inc |
143 option E32PATH $(EXTENSION_ROOT)/../../../kernel/eka/../. |
148 option E32PATH $(EXTENSION_ROOT)/../../../kernel/eka/../. |
144 |
149 |
145 end |
150 end |
146 |
151 |
|
152 #if 0 // second part of workaround - avoid dangling #endif |
147 #endif // !SBSV2 |
153 #endif // !SBSV2 |