Commit 5f79e84ae37e35738d9935c3195da932354a99c8

Authored by xiemeng
1 parent 5e1c3fbf

修改工程目录树结构

@@ -252,7 +252,6 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -252,7 +252,6 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
252 break; 252 break;
253 253
254 case SP_IMEI_MD_STAGE: 254 case SP_IMEI_MD_STAGE:
255 -  
256 bWriteModemFail = false; 255 bWriteModemFail = false;
257 for (MDIndex = 0; MDIndex < mdNums && bWriteModemFail == false; MDIndex++) 256 for (MDIndex = 0; MDIndex < mdNums && bWriteModemFail == false; MDIndex++)
258 { 257 {
@@ -80,7 +80,7 @@ BSC32=bscmake.exe @@ -80,7 +80,7 @@ BSC32=bscmake.exe
80 # ADD BSC32 /nologo 80 # ADD BSC32 /nologo
81 LINK32=link.exe 81 LINK32=link.exe
82 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept 82 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
83 -# ADD LINK32 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept 83 +# ADD LINK32 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /debug /machine:I386 /out:"..\intex_tool\SN Writer.exe" /pdbtype:sept
84 # SUBTRACT LINK32 /pdb:none /incremental:no 84 # SUBTRACT LINK32 /pdb:none /incremental:no
85 85
86 !ENDIF 86 !ENDIF
@@ -92,30 +92,6 @@ LINK32=link.exe @@ -92,30 +92,6 @@ LINK32=link.exe
92 # Begin Group "Source Files" 92 # Begin Group "Source Files"
93 93
94 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" 94 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
95 -# Begin Group "Common_SRC"  
96 -  
97 -# PROP Default_Filter ""  
98 -# Begin Source File  
99 -  
100 -SOURCE=.\Common\Common.cpp  
101 -# End Source File  
102 -# End Group  
103 -# Begin Group "Exec_SRC"  
104 -  
105 -# PROP Default_Filter ""  
106 -# Begin Source File  
107 -  
108 -SOURCE=.\Execute\FPexc.cpp  
109 -# End Source File  
110 -# Begin Source File  
111 -  
112 -SOURCE=.\Execute\SNbase.cpp  
113 -# End Source File  
114 -# Begin Source File  
115 -  
116 -SOURCE=.\Execute\SPexc.cpp  
117 -# End Source File  
118 -# End Group  
119 # Begin Group "MtkLib_SRC" 95 # Begin Group "MtkLib_SRC"
120 96
121 # PROP Default_Filter "" 97 # PROP Default_Filter ""
@@ -156,85 +132,53 @@ SOURCE=.\MtkLib\Security\src\SLA.cpp @@ -156,85 +132,53 @@ SOURCE=.\MtkLib\Security\src\SLA.cpp
156 # End Source File 132 # End Source File
157 # End Group 133 # End Group
158 # End Group 134 # End Group
159 -# Begin Group "Form_SRC"  
160 -  
161 -# PROP Default_Filter ""  
162 -# Begin Group "FileSel_SRC" 135 +# Begin Group "Extra_SRC"
163 136
164 # PROP Default_Filter "" 137 # PROP Default_Filter ""
165 # Begin Source File 138 # Begin Source File
166 139
167 -SOURCE=.\Form\FileSel\fileseldlg.cpp 140 +SOURCE=.\Form\AutoGen\autogendlg.cpp
168 # End Source File 141 # End Source File
169 -# End Group  
170 -# Begin Group "Identify_SRC"  
171 -  
172 -# PROP Default_Filter ""  
173 # Begin Source File 142 # Begin Source File
174 143
175 -SOURCE=.\Form\Identify\ChgPasswdDlg.cpp 144 +SOURCE=.\Extra\CBtnST\BtnST.cpp
176 # End Source File 145 # End Source File
177 # Begin Source File 146 # Begin Source File
178 147
179 -SOURCE=.\Form\Identify\VerifyPasswdDlg.cpp 148 +SOURCE=.\Extra\CBtnST\CeXDib.cpp
180 # End Source File 149 # End Source File
181 -# End Group  
182 -# Begin Group "ScanData_SRC"  
183 -  
184 -# PROP Default_Filter ""  
185 # Begin Source File 150 # Begin Source File
186 151
187 -SOURCE=.\Form\ScanData\ScanData.cpp 152 +SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp
188 # End Source File 153 # End Source File
189 # End Group 154 # End Group
190 -# Begin Group "SystemConfig_SRC"  
191 -  
192 -# PROP Default_Filter ""  
193 # Begin Source File 155 # Begin Source File
194 156
195 -SOURCE=.\Form\SystemConfig\SystemConfig.cpp 157 +SOURCE=.\Form\About\AboutSNDlg.cpp
196 # End Source File 158 # End Source File
197 -# End Group  
198 -# Begin Group "About_SRC"  
199 -  
200 -# PROP Default_Filter ""  
201 # Begin Source File 159 # Begin Source File
202 160
203 -SOURCE=.\Form\About\AboutSNDlg.cpp 161 +SOURCE=.\Form\Identify\ChgPasswdDlg.cpp
204 # End Source File 162 # End Source File
205 -# End Group  
206 -# Begin Group "AutoGen_SRC"  
207 -  
208 -# PROP Default_Filter ""  
209 # Begin Source File 163 # Begin Source File
210 164
211 -SOURCE=.\Form\AutoGen\autogendlg.cpp 165 +SOURCE=.\Common\Common.cpp
212 # End Source File 166 # End Source File
213 -# End Group  
214 -# End Group  
215 -# Begin Group "Extra_SRC"  
216 -  
217 -# PROP Default_Filter ""  
218 -# Begin Group "BtnST_SRC"  
219 -  
220 -# PROP Default_Filter ""  
221 # Begin Source File 167 # Begin Source File
222 168
223 -SOURCE=.\Extra\CBtnST\BtnST.cpp 169 +SOURCE=.\Encryption.cpp
224 # End Source File 170 # End Source File
225 # Begin Source File 171 # Begin Source File
226 172
227 -SOURCE=.\Extra\CBtnST\CeXDib.cpp 173 +SOURCE=.\Form\FileSel\fileseldlg.cpp
228 # End Source File 174 # End Source File
229 # Begin Source File 175 # Begin Source File
230 176
231 -SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp 177 +SOURCE=.\Execute\FPexc.cpp
232 # End Source File 178 # End Source File
233 -# End Group  
234 -# End Group  
235 # Begin Source File 179 # Begin Source File
236 180
237 -SOURCE=.\Encryption.cpp 181 +SOURCE=.\Form\ScanData\ScanData.cpp
238 # End Source File 182 # End Source File
239 # Begin Source File 183 # Begin Source File
240 184
@@ -246,9 +190,25 @@ SOURCE=".\SN WriterDlg.cpp" @@ -246,9 +190,25 @@ SOURCE=".\SN WriterDlg.cpp"
246 # End Source File 190 # End Source File
247 # Begin Source File 191 # Begin Source File
248 192
  193 +SOURCE=.\Execute\SNbase.cpp
  194 +# End Source File
  195 +# Begin Source File
  196 +
  197 +SOURCE=.\Execute\SPexc.cpp
  198 +# End Source File
  199 +# Begin Source File
  200 +
249 SOURCE=".\StdAfx.cpp" 201 SOURCE=".\StdAfx.cpp"
250 # ADD CPP /Yc 202 # ADD CPP /Yc
251 # End Source File 203 # End Source File
  204 +# Begin Source File
  205 +
  206 +SOURCE=.\Form\SystemConfig\SystemConfig.cpp
  207 +# End Source File
  208 +# Begin Source File
  209 +
  210 +SOURCE=.\Form\Identify\VerifyPasswdDlg.cpp
  211 +# End Source File
252 # End Group 212 # End Group
253 # Begin Group "Header Files" 213 # Begin Group "Header Files"
254 214
@@ -256,33 +216,22 @@ SOURCE=".\StdAfx.cpp" @@ -256,33 +216,22 @@ SOURCE=".\StdAfx.cpp"
256 # Begin Group "Common_HDR" 216 # Begin Group "Common_HDR"
257 217
258 # PROP Default_Filter "" 218 # PROP Default_Filter ""
259 -# Begin Source File  
260 -  
261 -SOURCE=.\Common\Common.h  
262 -# End Source File  
263 # End Group 219 # End Group
264 -# Begin Group "Exec_HDR" 220 +# Begin Group "MtkLib_HDR"
265 221
266 # PROP Default_Filter "" 222 # PROP Default_Filter ""
267 # Begin Source File 223 # Begin Source File
268 224
269 -SOURCE=.\Execute\FPexc.h 225 +SOURCE=.\MtkLib\AT_cmd\inc\AtProcess.h
270 # End Source File 226 # End Source File
271 # Begin Source File 227 # Begin Source File
272 228
273 -SOURCE=.\Execute\SNbase.h 229 +SOURCE=.\MtkLib\Security\inc\AUTH.h
274 # End Source File 230 # End Source File
275 # Begin Source File 231 # Begin Source File
276 232
277 -SOURCE=.\Execute\SPexc.h 233 +SOURCE=.\MtkLib\SNFstream\inc\AutoGen.h
278 # End Source File 234 # End Source File
279 -# End Group  
280 -# Begin Group "MtkLib_HDR"  
281 -  
282 -# PROP Default_Filter ""  
283 -# Begin Group "Meta_HDR"  
284 -  
285 -# PROP Default_Filter ""  
286 # Begin Source File 235 # Begin Source File
287 236
288 SOURCE=.\MtkLib\Meta\inc\brom.h 237 SOURCE=.\MtkLib\Meta\inc\brom.h
@@ -293,6 +242,10 @@ SOURCE=.\MtkLib\Meta\inc\com_enum.h @@ -293,6 +242,10 @@ SOURCE=.\MtkLib\Meta\inc\com_enum.h
293 # End Source File 242 # End Source File
294 # Begin Source File 243 # Begin Source File
295 244
  245 +SOURCE=.\MtkLib\Security\inc\des.h
  246 +# End Source File
  247 +# Begin Source File
  248 +
296 SOURCE=.\MtkLib\Meta\inc\DOWNLOAD.H 249 SOURCE=.\MtkLib\Meta\inc\DOWNLOAD.H
297 # End Source File 250 # End Source File
298 # Begin Source File 251 # Begin Source File
@@ -317,6 +270,10 @@ SOURCE=.\MtkLib\Meta\inc\HdcpEncryption.h @@ -317,6 +270,10 @@ SOURCE=.\MtkLib\Meta\inc\HdcpEncryption.h
317 # End Source File 270 # End Source File
318 # Begin Source File 271 # Begin Source File
319 272
  273 +SOURCE=.\MtkLib\DebugTrace\inc\Mdebug.h
  274 +# End Source File
  275 +# Begin Source File
  276 +
320 SOURCE=.\MtkLib\Meta\inc\meta.h 277 SOURCE=.\MtkLib\Meta\inc\meta.h
321 # End Source File 278 # End Source File
322 # Begin Source File 279 # Begin Source File
@@ -337,193 +294,136 @@ SOURCE=.\MtkLib\Meta\inc\rom_setting.h @@ -337,193 +294,136 @@ SOURCE=.\MtkLib\Meta\inc\rom_setting.h
337 # End Source File 294 # End Source File
338 # Begin Source File 295 # Begin Source File
339 296
340 -SOURCE=.\MtkLib\Meta\inc\sp_brom.h  
341 -# End Source File  
342 -# Begin Source File  
343 -  
344 -SOURCE=.\MtkLib\Meta\inc\SP_META_Wrapper.h  
345 -# End Source File  
346 -# Begin Source File  
347 -  
348 -SOURCE=.\MtkLib\Meta\inc\spmeta.h 297 +SOURCE=.\MtkLib\AT_cmd\inc\rs232Module.h
349 # End Source File 298 # End Source File
350 # Begin Source File 299 # Begin Source File
351 300
352 -SOURCE=.\MtkLib\Meta\inc\wm_meta_cct.h 301 +SOURCE=.\MtkLib\Security\inc\SCERT.h
353 # End Source File 302 # End Source File
354 # Begin Source File 303 # Begin Source File
355 304
356 -SOURCE=.\MtkLib\Meta\inc\wm_meta_cct_6238.h 305 +SOURCE=.\MtkLib\Security\inc\SLA.h
357 # End Source File 306 # End Source File
358 # Begin Source File 307 # Begin Source File
359 308
360 -SOURCE=.\MtkLib\Meta\inc\xboot.h 309 +SOURCE=.\MtkLib\Security\inc\SLA_Challenge.h
361 # End Source File 310 # End Source File
362 -# End Group  
363 -# Begin Group "ATCmd_HDR"  
364 -  
365 -# PROP Default_Filter ""  
366 # Begin Source File 311 # Begin Source File
367 312
368 -SOURCE=.\MtkLib\AT_cmd\inc\AtProcess.h 313 +SOURCE=.\MtkLib\SNFstream\inc\SNFstream.h
369 # End Source File 314 # End Source File
370 # Begin Source File 315 # Begin Source File
371 316
372 -SOURCE=.\MtkLib\AT_cmd\inc\rs232Module.h 317 +SOURCE=.\MtkLib\Meta\inc\sp_brom.h
373 # End Source File 318 # End Source File
374 -# End Group  
375 -# Begin Group "DebugTrace_HDR"  
376 -  
377 -# PROP Default_Filter ""  
378 # Begin Source File 319 # Begin Source File
379 320
380 -SOURCE=.\MtkLib\DebugTrace\inc\Mdebug.h 321 +SOURCE=.\MtkLib\Meta\inc\SP_META_Wrapper.h
381 # End Source File 322 # End Source File
382 # Begin Source File 323 # Begin Source File
383 324
384 -SOURCE=.\MtkLib\DebugTrace\inc\xboot_debug.h 325 +SOURCE=.\MtkLib\Meta\inc\spmeta.h
385 # End Source File 326 # End Source File
386 -# End Group  
387 -# Begin Group "Security_HDR"  
388 -  
389 -# PROP Default_Filter ""  
390 # Begin Source File 327 # Begin Source File
391 328
392 -SOURCE=.\MtkLib\Security\inc\AUTH.h 329 +SOURCE=.\MtkLib\USBSwitchTool\inc\USBSwitchDLLibrary.h
393 # End Source File 330 # End Source File
394 # Begin Source File 331 # Begin Source File
395 332
396 -SOURCE=.\MtkLib\Security\inc\des.h 333 +SOURCE=.\MtkLib\Meta\inc\wm_meta_cct.h
397 # End Source File 334 # End Source File
398 # Begin Source File 335 # Begin Source File
399 336
400 -SOURCE=.\MtkLib\Security\inc\SCERT.h 337 +SOURCE=.\MtkLib\Meta\inc\wm_meta_cct_6238.h
401 # End Source File 338 # End Source File
402 # Begin Source File 339 # Begin Source File
403 340
404 -SOURCE=.\MtkLib\Security\inc\SLA.h 341 +SOURCE=.\MtkLib\Meta\inc\xboot.h
405 # End Source File 342 # End Source File
406 # Begin Source File 343 # Begin Source File
407 344
408 -SOURCE=.\MtkLib\Security\inc\SLA_Challenge.h 345 +SOURCE=.\MtkLib\DebugTrace\inc\xboot_debug.h
409 # End Source File 346 # End Source File
410 # End Group 347 # End Group
411 -# Begin Group "SNFstream_HDR" 348 +# Begin Group "Extra_HDR"
412 349
413 # PROP Default_Filter "" 350 # PROP Default_Filter ""
414 # Begin Source File 351 # Begin Source File
415 352
416 -SOURCE=.\MtkLib\SNFstream\inc\AutoGen.h 353 +SOURCE=.\Extra\CBtnST\BtnST.h
417 # End Source File 354 # End Source File
418 # Begin Source File 355 # Begin Source File
419 356
420 -SOURCE=.\MtkLib\SNFstream\inc\SNFstream.h 357 +SOURCE=.\Extra\CBtnST\CeXDib.h
421 # End Source File 358 # End Source File
422 -# End Group  
423 -# Begin Group "USBSwitchTool_HDR"  
424 -  
425 -# PROP Default_Filter ""  
426 # Begin Source File 359 # Begin Source File
427 360
428 -SOURCE=.\MtkLib\USBSwitchTool\inc\USBSwitchDLLibrary.h 361 +SOURCE=.\Extra\CBtnST\ShadeButtonST.h
429 # End Source File 362 # End Source File
430 # End Group 363 # End Group
431 -# End Group  
432 -# Begin Group "Form_HDR"  
433 -  
434 -# PROP Default_Filter ""  
435 -# Begin Group "FileSel_HDR"  
436 -  
437 -# PROP Default_Filter ""  
438 # Begin Source File 364 # Begin Source File
439 365
440 -SOURCE=.\Form\FileSel\fileseldlg.h 366 +SOURCE=.\Form\About\AboutSNDlg.h
441 # End Source File 367 # End Source File
442 -# End Group  
443 -# Begin Group "Identify_HDR" 368 +# Begin Source File
444 369
445 -# PROP Default_Filter "" 370 +SOURCE=.\Form\AutoGen\autogendlg.h
  371 +# End Source File
446 # Begin Source File 372 # Begin Source File
447 373
448 SOURCE=.\Form\Identify\ChgPasswdDlg.h 374 SOURCE=.\Form\Identify\ChgPasswdDlg.h
449 # End Source File 375 # End Source File
450 # Begin Source File 376 # Begin Source File
451 377
452 -SOURCE=.\Form\Identify\VerifyPasswdDlg.h 378 +SOURCE=.\Common\Common.h
453 # End Source File 379 # End Source File
454 -# End Group  
455 -# Begin Group "ScanData_HDR"  
456 -  
457 -# PROP Default_Filter ""  
458 # Begin Source File 380 # Begin Source File
459 381
460 -SOURCE=.\Form\ScanData\ScanData.h 382 +SOURCE=.\Encryption.h
461 # End Source File 383 # End Source File
462 -# End Group  
463 -# Begin Group "SystemConfig_HDR"  
464 -  
465 -# PROP Default_Filter ""  
466 # Begin Source File 384 # Begin Source File
467 385
468 -SOURCE=.\Form\SystemConfig\SystemConfig.h 386 +SOURCE=.\Form\FileSel\fileseldlg.h
469 # End Source File 387 # End Source File
470 -# End Group  
471 -# Begin Group "About_HDR"  
472 -  
473 -# PROP Default_Filter ""  
474 # Begin Source File 388 # Begin Source File
475 389
476 -SOURCE=.\Form\About\AboutSNDlg.h 390 +SOURCE=.\Execute\FPexc.h
477 # End Source File 391 # End Source File
478 -# End Group  
479 -# Begin Group "AutoGen_HDR"  
480 -  
481 -# PROP Default_Filter ""  
482 # Begin Source File 392 # Begin Source File
483 393
484 -SOURCE=.\Form\AutoGen\autogendlg.h 394 +SOURCE=.\Resource.h
485 # End Source File 395 # End Source File
486 -# End Group  
487 -# End Group  
488 -# Begin Group "Extra_HDR"  
489 -  
490 -# PROP Default_Filter ""  
491 -# Begin Group "BtnST_HDR"  
492 -  
493 -# PROP Default_Filter ""  
494 # Begin Source File 396 # Begin Source File
495 397
496 -SOURCE=.\Extra\CBtnST\BtnST.h 398 +SOURCE=.\Form\ScanData\ScanData.h
497 # End Source File 399 # End Source File
498 # Begin Source File 400 # Begin Source File
499 401
500 -SOURCE=.\Extra\CBtnST\CeXDib.h 402 +SOURCE=".\SN Writer.h"
501 # End Source File 403 # End Source File
502 # Begin Source File 404 # Begin Source File
503 405
504 -SOURCE=.\Extra\CBtnST\ShadeButtonST.h 406 +SOURCE=".\SN WriterDlg.h"
505 # End Source File 407 # End Source File
506 -# End Group  
507 -# End Group  
508 # Begin Source File 408 # Begin Source File
509 409
510 -SOURCE=.\Encryption.h 410 +SOURCE=.\Execute\SNbase.h
511 # End Source File 411 # End Source File
512 # Begin Source File 412 # Begin Source File
513 413
514 -SOURCE=.\Resource.h 414 +SOURCE=.\Execute\SPexc.h
515 # End Source File 415 # End Source File
516 # Begin Source File 416 # Begin Source File
517 417
518 -SOURCE=".\SN Writer.h" 418 +SOURCE=".\StdAfx.h"
519 # End Source File 419 # End Source File
520 # Begin Source File 420 # Begin Source File
521 421
522 -SOURCE=".\SN WriterDlg.h" 422 +SOURCE=.\Form\SystemConfig\SystemConfig.h
523 # End Source File 423 # End Source File
524 # Begin Source File 424 # Begin Source File
525 425
526 -SOURCE=".\StdAfx.h" 426 +SOURCE=.\Form\Identify\VerifyPasswdDlg.h
527 # End Source File 427 # End Source File
528 # End Group 428 # End Group
529 # Begin Group "Resource Files" 429 # Begin Group "Resource Files"
Please register or login to post a comment