Ticket #8723: sort_engines2.patch

File sort_engines2.patch, 11.5 KB (added by jvprat, 17 years ago)

Sort engines leaving SCUMM and variants at the top

  • configure

     
    4949_build_scumm=yes
    5050_build_scumm_7_8=yes
    5151_build_he=yes
     52_build_agi=yes
    5253_build_agos=yes
     54_build_cine=yes
     55_build_cruise=no
     56_build_drascula=no
     57_build_gob=yes
     58_build_kyra=yes
     59_build_lure=yes
     60_build_parallaction=yes
     61_build_queen=yes
     62_build_saga=yes
    5363_build_sky=yes
    5464_build_sword1=yes
    5565_build_sword2=yes
    56 _build_queen=yes
    57 _build_saga=yes
    58 _build_gob=yes
    59 _build_kyra=yes
    60 _build_lure=yes
    61 _build_cine=yes
    62 _build_agi=yes
    6366_build_touche=yes
    64 _build_parallaction=yes
    65 _build_cruise=no
    66 _build_drascula=no
    6767_build_hq_scalers=yes
    6868_build_scalers=yes
    6969
    … …  
    350350Optional Features:
    351351  --disable-debug          disable building with debugging symbols
    352352  --enable-Werror          treat warnings as errors
     353  --disable-scumm          don't build the SCUMM engine
     354  --disable-scumm-7-8      exclude v7 and v8 game in SCUMM engine (ft, dig, comi and demos)
     355  --disable-he             exclude HE70+ games in SCUMM engine
    353356  --disable-agi            don't build the AGI engine
    354357  --disable-agos           don't build the AGOS engine
    355358  --disable-cine           don't build the Cinematique engine evo 1
    … …  
    358361  --disable-gob            don't build the Gobli*ns engine
    359362  --disable-kyra           don't build the Legend of Kyrandia engine
    360363  --disable-lure           don't build the Lure of the Temptress engine
    361   --disable-he             exclude HE70+ games in SCUMM engine
    362364  --disable-parallaction   don't build the Parallaction engine
    363365  --disable-queen          don't build the Flight of the Amazon Queen engine
    364366  --disable-saga           don't build the SAGA engine
    365   --disable-scumm          don't build the SCUMM engine
    366   --disable-scumm-7-8      exclude v7 and v8 game in SCUMM engine (ft, dig, comi and demos)
    367367  --disable-sky            don't build the Beneath a Steel Sky engine
    368368  --disable-sword1         don't build the Broken Sword 1 engine
    369369  --disable-sword2         don't build the Broken Sword 2 engine
    … …  
    426426      --disable-scumm)          _build_scumm=no ;;
    427427      --disable-scumm-7-8)      _build_scumm_7_8=no ;;
    428428      --disable-he)             _build_he=no ;;
     429      --disable-agi)            _build_agi=no ;;
    429430      --disable-agos)           _build_agos=no ;;
     431      --disable-cine)           _build_cine=no ;;
     432      --enable-cruise)          _build_cruise=yes ;;
     433      --enable-drascula)        _build_drascula=yes ;;
     434      --disable-gob)            _build_gob=no ;;
     435      --disable-kyra)           _build_kyra=no ;;
     436      --disable-lure)           _build_lure=no ;;
     437      --disable-parallaction)   _build_parallaction=no ;;
     438      --disable-queen)          _build_queen=no ;;
     439      --disable-saga)           _build_saga=no ;;
    430440      --disable-sky)            _build_sky=no ;;
    431441      --disable-sword1)         _build_sword1=no ;;
    432442      --disable-sword2)         _build_sword2=no ;;
    433       --disable-queen)          _build_queen=no ;;
    434       --disable-saga)           _build_saga=no ;;
    435       --disable-gob)            _build_gob=no ;;
    436       --disable-kyra)           _build_kyra=no ;;
    437       --disable-lure)           _build_lure=no ;;
    438       --disable-cine)           _build_cine=no ;;
    439       --disable-agi)            _build_agi=no ;;
    440443      --disable-touche)         _build_touche=no ;;
    441       --disable-parallaction)   _build_parallaction=no ;;
    442       --enable-cruise)          _build_cruise=yes ;;
    443       --enable-drascula)        _build_drascula=yes ;;
    444444      --disable-hq-scalers)     _build_hq_scalers=no ;;
    445445      --disable-scalers)        _build_scalers=no ;;
    446446      --enable-alsa)            _alsa=yes       ;;
    … …  
    719719add_to_config_mk_if_no $_build_scumm        'DISABLE_SCUMM = 1'
    720720add_to_config_mk_if_no $_build_scumm_7_8    'DISABLE_SCUMM_7_8 = 1'
    721721add_to_config_mk_if_no $_build_he           'DISABLE_HE = 1'
     722add_to_config_mk_if_no $_build_agi          'DISABLE_AGI = 1'
    722723add_to_config_mk_if_no $_build_agos         'DISABLE_AGOS = 1'
     724add_to_config_mk_if_no $_build_cine         'DISABLE_CINE = 1'
     725add_to_config_mk_if_no $_build_cruise       'DISABLE_CRUISE = 1'
     726add_to_config_mk_if_no $_build_drascula     'DISABLE_DRASCULA = 1'
     727add_to_config_mk_if_no $_build_gob          'DISABLE_GOB = 1'
     728add_to_config_mk_if_no $_build_kyra         'DISABLE_KYRA = 1'
     729add_to_config_mk_if_no $_build_lure         'DISABLE_LURE = 1'
     730add_to_config_mk_if_no $_build_parallaction 'DISABLE_PARALLACTION = 1'
     731add_to_config_mk_if_no $_build_queen        'DISABLE_QUEEN = 1'
     732add_to_config_mk_if_no $_build_saga         'DISABLE_SAGA = 1'
    723733add_to_config_mk_if_no $_build_sky          'DISABLE_SKY = 1'
    724734add_to_config_mk_if_no $_build_sword1       'DISABLE_SWORD1 = 1'
    725735add_to_config_mk_if_no $_build_sword2       'DISABLE_SWORD2 = 1'
    726 add_to_config_mk_if_no $_build_queen        'DISABLE_QUEEN = 1'
    727 add_to_config_mk_if_no $_build_kyra         'DISABLE_KYRA = 1'
    728 add_to_config_mk_if_no $_build_saga         'DISABLE_SAGA = 1'
    729 add_to_config_mk_if_no $_build_gob          'DISABLE_GOB = 1'
    730 add_to_config_mk_if_no $_build_lure         'DISABLE_LURE = 1'
    731 add_to_config_mk_if_no $_build_cine         'DISABLE_CINE = 1'
    732 add_to_config_mk_if_no $_build_agi          'DISABLE_AGI = 1'
    733736add_to_config_mk_if_no $_build_touche       'DISABLE_TOUCHE = 1'
    734 add_to_config_mk_if_no $_build_parallaction 'DISABLE_PARALLACTION = 1'
    735 add_to_config_mk_if_no $_build_cruise       'DISABLE_CRUISE = 1'
    736 add_to_config_mk_if_no $_build_drascula     'DISABLE_DRASCULA = 1'
    737737add_to_config_mk_if_no $_build_hq_scalers   'DISABLE_HQ_SCALERS = 1'
    738738add_to_config_mk_if_no $_build_scalers      'DISABLE_SCALERS = 1'
    739739
    … …  
    13401340        fi
    13411341        echo
    13421342fi
     1343if test "$_build_agi" = yes ; then
     1344        echo "    AGI"
     1345fi
    13431346if test "$_build_agos" = yes ; then
    13441347        echo "    AGOS"
    13451348fi
     1349if test "$_build_cine" = yes ; then
     1350        echo "    Cinematique evo 1"
     1351fi
     1352if test "$_build_cruise" = yes ; then
     1353        echo "    Cinematique evo 2"
     1354fi
     1355if test "$_build_drascula" = yes ; then
     1356        echo "    Drascula"
     1357fi
     1358if test "$_build_gob" = yes ; then
     1359        echo "    Gobli*ns"
     1360fi
     1361if test "$_build_kyra" = yes ; then
     1362        echo "    Legend of Kyrandia"
     1363fi
     1364if test "$_build_lure" = yes ; then
     1365        echo "    Lure of the Temptress"
     1366fi
     1367if test "$_build_parallaction" = yes ; then
     1368        echo "    Parallaction"
     1369fi
     1370if test "$_build_queen" = yes ; then
     1371        echo "    Flight of the Amazon Queen"
     1372fi
     1373if test "$_build_saga" = yes ; then
     1374        echo "    SAGA"
     1375fi
    13461376if test "$_build_sky" = yes ; then
    13471377        echo "    Beneath a Steel Sky"
    13481378fi
    … …  
    13621392                echo " (without mpeg2 cutscenes)"
    13631393        fi
    13641394fi
    1365 if test "$_build_queen" = yes ; then
    1366         echo "    Flight of the Amazon Queen"
    1367 fi
    1368 if test "$_build_saga" = yes ; then
    1369         echo "    SAGA"
    1370 fi
    1371 if test "$_build_kyra" = yes ; then
    1372         echo "    Legend of Kyrandia"
    1373 fi
    1374 if test "$_build_gob" = yes ; then
    1375         echo "    Gobli*ns"
    1376 fi
    1377 if test "$_build_lure" = yes ; then
    1378         echo "    Lure of the Temptress"
    1379 fi
    1380 if test "$_build_cine" = yes ; then
    1381         echo "    Cinematique evo 1"
    1382 fi
    1383 if test "$_build_agi" = yes ; then
    1384         echo "    AGI"
    1385 fi
    13861395if test "$_build_touche" = yes ; then
    13871396        echo "    Touche: The Adventures of the Fifth Musketeer"
    13881397fi
    1389 if test "$_build_parallaction" = yes ; then
    1390         echo "    Parallaction"
    1391 fi
    1392 if test "$_build_cruise" = yes ; then
    1393         echo "    Cinematique evo 2"
    1394 fi
    1395 if test "$_build_drascula" = yes ; then
    1396         echo "    Drascula"
    1397 fi
    13981398
    13991399echo
    14001400

  • engines/engines.mk

     
    1313
    1414endif
    1515
     16ifdef DISABLE_AGI
     17DEFINES += -DDISABLE_AGI
     18else
     19MODULES += engines/agi
     20endif
     21
    1622ifdef DISABLE_AGOS
    1723DEFINES += -DDISABLE_AGOS
    1824else
    1925MODULES += engines/agos
    2026endif
    2127
    22 ifdef DISABLE_SKY
    23 DEFINES += -DDISABLE_SKY
     28ifdef DISABLE_CINE
     29DEFINES += -DDISABLE_CINE
    2430else
    25 MODULES += engines/sky
     31MODULES += engines/cine
    2632endif
    2733
    28 ifdef DISABLE_SWORD1
    29 DEFINES += -DDISABLE_SWORD1
     34ifdef DISABLE_CRUISE
     35DEFINES += -DDISABLE_CRUISE
    3036else
    31 MODULES += engines/sword1
     37MODULES += engines/cruise
    3238endif
    3339
    34 ifdef DISABLE_SWORD2
    35 DEFINES += -DDISABLE_SWORD2
     40ifdef DISABLE_DRASCULA
     41DEFINES += -DDISABLE_DRASCULA
    3642else
    37 MODULES += engines/sword2
     43MODULES += engines/drascula
    3844endif
    3945
    40 ifdef DISABLE_QUEEN
    41 DEFINES += -DDISABLE_QUEEN
     46ifdef DISABLE_GOB
     47DEFINES += -DDISABLE_GOB
    4248else
    43 MODULES += engines/queen
     49MODULES += engines/gob
    4450endif
    4551
    46 ifdef DISABLE_SAGA
    47 DEFINES += -DDISABLE_SAGA
    48 else
    49 MODULES += engines/saga
    50 endif
    51 
    5252ifdef DISABLE_KYRA
    5353DEFINES += -DDISABLE_KYRA
    5454else
    5555MODULES += engines/kyra
    5656endif
    5757
    58 ifdef DISABLE_GOB
    59 DEFINES += -DDISABLE_GOB
    60 else
    61 MODULES += engines/gob
    62 endif
    63 
    6458ifdef DISABLE_LURE
    6559DEFINES += -DDISABLE_LURE
    6660else
    6761MODULES += engines/lure
    6862endif
    6963
    70 ifdef DISABLE_CINE
    71 DEFINES += -DDISABLE_CINE
     64ifdef DISABLE_PARALLACTION
     65DEFINES += -DDISABLE_PARALLACTION
    7266else
    73 MODULES += engines/cine
     67MODULES += engines/parallaction
    7468endif
    7569
    76 ifdef DISABLE_AGI
    77 DEFINES += -DDISABLE_AGI
     70ifdef DISABLE_QUEEN
     71DEFINES += -DDISABLE_QUEEN
    7872else
    79 MODULES += engines/agi
     73MODULES += engines/queen
    8074endif
    8175
    82 ifdef DISABLE_TOUCHE
    83 DEFINES += -DDISABLE_TOUCHE
     76ifdef DISABLE_SAGA
     77DEFINES += -DDISABLE_SAGA
    8478else
    85 MODULES += engines/touche
     79MODULES += engines/saga
    8680endif
    8781
    88 ifdef DISABLE_PARALLACTION
    89 DEFINES += -DDISABLE_PARALLACTION
     82ifdef DISABLE_SKY
     83DEFINES += -DDISABLE_SKY
    9084else
    91 MODULES += engines/parallaction
     85MODULES += engines/sky
    9286endif
    9387
    94 ifdef DISABLE_CRUISE
    95 DEFINES += -DDISABLE_CRUISE
     88ifdef DISABLE_SWORD1
     89DEFINES += -DDISABLE_SWORD1
    9690else
    97 MODULES += engines/cruise
     91MODULES += engines/sword1
    9892endif
    9993
    100 ifdef DISABLE_DRASCULA
    101 DEFINES += -DDISABLE_DRASCULA
     94ifdef DISABLE_SWORD2
     95DEFINES += -DDISABLE_SWORD2
    10296else
    103 MODULES += engines/drascula
     97MODULES += engines/sword2
    10498endif
     99
     100ifdef DISABLE_TOUCHE
     101DEFINES += -DDISABLE_TOUCHE
     102else
     103MODULES += engines/touche
     104endif

  • base/plugins.cpp

     
    8989                #ifndef DISABLE_SCUMM
    9090                LINK_PLUGIN(SCUMM)
    9191                #endif
    92                 #ifndef DISABLE_SKY
    93                 LINK_PLUGIN(SKY)
     92                #ifndef DISABLE_AGI
     93                LINK_PLUGIN(AGI)
    9494                #endif
    95                 #ifndef DISABLE_SWORD1
    96                 LINK_PLUGIN(SWORD1)
    97                 #endif
    98                 #ifndef DISABLE_SWORD2
    99                 LINK_PLUGIN(SWORD2)
    100                 #endif
    10195                #ifndef DISABLE_AGOS
    10296                LINK_PLUGIN(AGOS)
    10397                #endif
    104                 #ifndef DISABLE_QUEEN
    105                 LINK_PLUGIN(QUEEN)
     98                #ifndef DISABLE_CINE
     99                LINK_PLUGIN(CINE)
    106100                #endif
    107                 #ifndef DISABLE_SAGA
    108                 LINK_PLUGIN(SAGA)
     101                #ifndef DISABLE_CRUISE
     102                LINK_PLUGIN(CRUISE)
    109103                #endif
    110                 #ifndef DISABLE_KYRA
    111                 LINK_PLUGIN(KYRA)
     104                #ifndef DISABLE_DRASCULA
     105                LINK_PLUGIN(DRASCULA)
    112106                #endif
    113107                #ifndef DISABLE_GOB
    114108                LINK_PLUGIN(GOB)
    115109                #endif
     110                #ifndef DISABLE_KYRA
     111                LINK_PLUGIN(KYRA)
     112                #endif
    116113                #ifndef DISABLE_LURE
    117114                LINK_PLUGIN(LURE)
    118115                #endif
    119                 #ifndef DISABLE_CINE
    120                 LINK_PLUGIN(CINE)
     116                #ifndef DISABLE_PARALLACTION
     117                LINK_PLUGIN(PARALLACTION)
    121118                #endif
    122                 #ifndef DISABLE_AGI
    123                 LINK_PLUGIN(AGI)
     119                #ifndef DISABLE_QUEEN
     120                LINK_PLUGIN(QUEEN)
    124121                #endif
    125                 #ifndef DISABLE_TOUCHE
    126                 LINK_PLUGIN(TOUCHE)
     122                #ifndef DISABLE_SAGA
     123                LINK_PLUGIN(SAGA)
    127124                #endif
    128                 #ifndef DISABLE_PARALLACTION
    129                 LINK_PLUGIN(PARALLACTION)
     125                #ifndef DISABLE_SKY
     126                LINK_PLUGIN(SKY)
    130127                #endif
    131                 #ifndef DISABLE_CRUISE
    132                 LINK_PLUGIN(CRUISE)
     128                #ifndef DISABLE_SWORD1
     129                LINK_PLUGIN(SWORD1)
    133130                #endif
    134                 #ifndef DISABLE_DRASCULA
    135                 LINK_PLUGIN(DRASCULA)
     131                #ifndef DISABLE_SWORD2
     132                LINK_PLUGIN(SWORD2)
    136133                #endif
     134                #ifndef DISABLE_TOUCHE
     135                LINK_PLUGIN(TOUCHE)
     136                #endif
    137137
    138138                return pl;
    139139        }