aboutsummaryrefslogtreecommitdiff
path: root/engines/configure.engines
diff options
context:
space:
mode:
authorKamil Zbróg2013-10-19 12:40:55 +0100
committerKamil Zbróg2013-10-19 12:40:55 +0100
commit852a9637119b544400984508ca20ccf47ed66a81 (patch)
tree34f4091af3ee3f08b6ee32092eaf28d7b8a62f83 /engines/configure.engines
parent3a4068f87be678bd7446c32a1baa8869522ebd71 (diff)
parenta9aaca460875c6d7a244e3f36a1cad62ec09411d (diff)
downloadscummvm-rg350-852a9637119b544400984508ca20ccf47ed66a81.tar.gz
scummvm-rg350-852a9637119b544400984508ca20ccf47ed66a81.tar.bz2
scummvm-rg350-852a9637119b544400984508ca20ccf47ed66a81.zip
Merge branch 'master' into prince
Conflicts: engines/plugins_table.h
Diffstat (limited to 'engines/configure.engines')
-rw-r--r--engines/configure.engines2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/configure.engines b/engines/configure.engines
index fab0862407..195d0a3426 100644
--- a/engines/configure.engines
+++ b/engines/configure.engines
@@ -6,6 +6,7 @@ add_engine he "HE71+ games" yes
add_engine agi "AGI" yes
add_engine agos "AGOS" yes "agos2" "AGOS 1 games"
add_engine agos2 "AGOS 2 games" yes
+add_engine avalanche "Lord Avalot d'Argent" no
add_engine cge "CGE" yes
add_engine cine "Cinematique evo 1" yes
add_engine composer "Magic Composer" yes
@@ -54,3 +55,4 @@ add_engine tony "Tony Tough and the Night of Roasted Moths" yes "" "" "16bit"
add_engine tsage "TsAGE" yes
add_engine tucker "Bud Tucker in Double Trouble" yes
add_engine wintermute "Wintermute" no "" "" "jpeg png zlib vorbis 16bit"
+add_engine zvision "ZVision" no "" "" "freetype2 16bit"