FreeCalypso > hg > fc-magnetite

comparison components/aci-classic @ 19:88f40f4c829f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
condat2 vs. condat3 includes selection logic
author Mychaela Falconia <falcon@freecalypso.org>
date Wed, 28 Sep 2016 01:37:28 +0000
parents 6323e661f2ed
children 67fe1b3f4bd7
comparison
equal deleted inserted replaced
18:c8bd5a927942 19:88f40f4c829f
63 CPPFLAGS="$CPPFLAGS -DUART" 63 CPPFLAGS="$CPPFLAGS -DUART"
64 CPPFLAGS="$CPPFLAGS -DFF_ATI" 64 CPPFLAGS="$CPPFLAGS -DFF_ATI"
65 65
66 # Includes 66 # Includes
67 67
68 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc" 68 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
69 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc" 69 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
70 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include" 70 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
71 CPPFLAGS="$CPPFLAGS -I../../$CDGINC" 71 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
72 72
73 if [ "$MMI" = 2 ] 73 if [ "$MMI" = 2 ]
74 then 74 then
75 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/mfw" 75 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/mfw"
450 CPPFLAGS="$CPPFLAGS -DSMS_PDU_SUPPORT" 450 CPPFLAGS="$CPPFLAGS -DSMS_PDU_SUPPORT"
451 CPPFLAGS="$CPPFLAGS -DSIM_TOOLKIT" 451 CPPFLAGS="$CPPFLAGS -DSIM_TOOLKIT"
452 452
453 # New includes 453 # New includes
454 454
455 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc" 455 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
456 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc" 456 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
457 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include" 457 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
458 CPPFLAGS="$CPPFLAGS -I../../$CDGINC" 458 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
459 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci" 459 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
460 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd" 460 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd"
461 CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM" 461 CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
462 462
519 CPPFLAGS="$CPPFLAGS -DSMS_PDU_SUPPORT" 519 CPPFLAGS="$CPPFLAGS -DSMS_PDU_SUPPORT"
520 CPPFLAGS="$CPPFLAGS -DSIM_TOOLKIT" 520 CPPFLAGS="$CPPFLAGS -DSIM_TOOLKIT"
521 521
522 # New includes 522 # New includes
523 523
524 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/inc" 524 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
525 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc" 525 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
526 CPPFLAGS="$CPPFLAGS -I$SRC/condat2/com/include" 526 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
527 CPPFLAGS="$CPPFLAGS -I../../$CDGINC" 527 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
528 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci" 528 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
529 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ati_ext" 529 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ati_ext"
530 CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM" 530 CPPFLAGS="$CPPFLAGS -I../../$CDGPRIM"
531 531