diff options
| author | Strangerke | 2012-10-10 08:29:27 +0200 |
|---|---|---|
| committer | Strangerke | 2012-10-10 08:29:27 +0200 |
| commit | bba9d9fc807a28dc485a8c214d7425cb95285636 (patch) | |
| tree | ed6a839d80e004e2d3fdc3137fa4c7392a38ac1d | |
| parent | b164cbb571fc4e0f2a6f002760a851d8ac592540 (diff) | |
| download | scummvm-rg350-bba9d9fc807a28dc485a8c214d7425cb95285636.tar.gz scummvm-rg350-bba9d9fc807a28dc485a8c214d7425cb95285636.tar.bz2 scummvm-rg350-bba9d9fc807a28dc485a8c214d7425cb95285636.zip | |
MORTEVIELLE: Fix merge
| -rw-r--r-- | engines/configure.engines | 1 | ||||
| -rw-r--r-- | engines/plugins_table.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/engines/configure.engines b/engines/configure.engines index a8eb89a7fa..ee29e3223a 100644 --- a/engines/configure.engines +++ b/engines/configure.engines @@ -24,6 +24,7 @@ add_engine lastexpress "The Last Express" no "" "" "16bit" add_engine lure "Lure of the Temptress" yes add_engine made "MADE" yes add_engine mohawk "Mohawk" yes "cstime myst riven" "Living Books" +add_engine mortevielle "Mortevielle" no add_engine cstime "Where in Time is Carmen Sandiego?" no add_engine riven "Riven: The Sequel to Myst" no "" "" "16bit" add_engine myst "Myst" no "" "" "16bit" diff --git a/engines/plugins_table.h b/engines/plugins_table.h index 010de0d5e2..5097c87a9d 100644 --- a/engines/plugins_table.h +++ b/engines/plugins_table.h @@ -41,6 +41,9 @@ LINK_PLUGIN(HUGO) #if PLUGIN_ENABLED_STATIC(KYRA) LINK_PLUGIN(KYRA) #endif +#if PLUGIN_ENABLED_STATIC(MORTEVIELLE) +LINK_PLUGIN(MORTEVIELLE) +#endif #if PLUGIN_ENABLED_STATIC(LASTEXPRESS) LINK_PLUGIN(LASTEXPRESS) #endif |