equal
deleted
inserted
replaced
107 // Call the makefile to build the bootstrap |
107 // Call the makefile to build the bootstrap |
108 // |
108 // |
109 |
109 |
110 PRJ_EXTENSIONS |
110 PRJ_EXTENSIONS |
111 |
111 |
|
112 #if 0 // Removing changes associated with introduction of bootstrap.flm - see Bug 2149 |
112 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter |
113 #ifdef SBSV2 // If using SBSv2 with bootstrap FLM, MEMMODEL MUST begin with a capital letter |
113 |
114 |
114 start extension base.bootstrap bootstrap |
115 start extension base.bootstrap bootstrap |
115 |
116 |
116 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
117 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
128 option E32PATH ../../../kernel/eka/../. |
129 option E32PATH ../../../kernel/eka/../. |
129 |
130 |
130 end |
131 end |
131 |
132 |
132 #else // !SBSV2 |
133 #else // !SBSV2 |
|
134 #endif // more workaround - close the #ifdef SBSV2 here, to regain the other bit |
|
135 #endif // first part of workaround - close the #ifdef 0 |
|
136 |
133 |
137 |
134 start extension base/bootstrap bootstrap |
138 start extension base/bootstrap bootstrap |
135 |
139 |
136 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
140 #ifdef SYMBIAN_OLD_EXPORT_LOCATION |
137 option INC_PATH $(EPOCROOT)epoc32/include |
141 option INC_PATH $(EPOCROOT)epoc32/include |
147 option INCLUDES $(EXTENSION_ROOT)/config.inc |
151 option INCLUDES $(EXTENSION_ROOT)/config.inc |
148 option E32PATH $(EXTENSION_ROOT)/../../../kernel/eka/../. |
152 option E32PATH $(EXTENSION_ROOT)/../../../kernel/eka/../. |
149 |
153 |
150 end |
154 end |
151 |
155 |
|
156 #if 0 // second part of workaround - avoid dangling #endif |
152 #endif // !SBSV2 |
157 #endif // !SBSV2 |