libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 04:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MOHAWK: Do not create additional folders for riven & myst metaengines.

Browse Source
This commit is contained in:
aryanrawlani28 2020-08-25 17:45:31 +05:30 committed by Eugene Sandulenko
parent 4f55c1b689
commit 1d3e4d2800
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/mohawk/detection.cpp
View File

@ -30,8 +30,8 @@
#include "mohawk/detection.h"
#include "mohawk/detection_enums.h"
#include "mohawk/riven_metaengine/metaengine.h"
#include "mohawk/myst_metaengine/metaengine.h"
#include "mohawk/riven_metaengine.h"
#include "mohawk/myst_metaengine.h"
static const PlainGameDescriptor mohawkGames[] = {

4
engines/mohawk/dialogs.cpp
View File

@ -38,13 +38,13 @@
#include "mohawk/myst.h"
#include "mohawk/myst_actions.h"
#include "mohawk/myst_scripts.h"
#include "mohawk/myst_metaengine/metaengine.h"
#include "mohawk/myst_metaengine.h"
#endif
#ifdef ENABLE_RIVEN
#include "mohawk/riven.h"
#include "mohawk/riven_graphics.h"
#include "mohawk/riven_metaengine/metaengine.h"
#include "mohawk/riven_metaengine.h"
#endif
namespace Mohawk {

8
engines/mohawk/module.mk
View File

@ -12,6 +12,8 @@ MODULE_OBJS = \
livingbooks_graphics.o \
livingbooks_lbx.o \
metaengine.o \
riven_metaengine.o \
myst_metaengine.o \
mohawk.o \
resource.o \
sound.o \
@ -30,7 +32,6 @@ endif
ifdef ENABLE_MYST
MODULE_OBJS += \
myst_metaengine/metaengine.o \
myst.o \
myst_areas.o \
myst_card.o \
@ -56,7 +57,6 @@ endif
ifdef ENABLE_RIVEN
MODULE_OBJS += \
riven_metaengine/metaengine.o \
riven.o \
riven_card.o \
riven_graphics.o \
@ -92,6 +92,6 @@ DETECT_OBJS += $(MODULE)/detection.o
# Skip building the following objects if a static
# module is enabled, because it already has the contents.
ifneq ($(ENABLE_MOHAWK), STATIC_PLUGIN)
DETECT_OBJS += $(MODULE)/myst_metaengine/metaengine.o
DETECT_OBJS += $(MODULE)/riven_metaengine/metaengine.o
DETECT_OBJS += $(MODULE)/myst_metaengine.o
DETECT_OBJS += $(MODULE)/riven_metaengine.o
endif

2
engines/mohawk/myst.cpp
View File

@ -63,7 +63,7 @@
#include "mohawk/myst_stacks/stoneship.h"
// Common files for detection & engines
#include "mohawk/myst_metaengine/metaengine.h"
#include "mohawk/myst_metaengine.h"
namespace Mohawk {

2
engines/mohawk/myst_metaengine/metaengine.cpp → engines/mohawk/myst_metaengine.cpp
View File

@ -20,7 +20,7 @@
*
*/
#include "mohawk/myst_metaengine/metaengine.h"
#include "mohawk/myst_metaengine.h"
void Mohawk::MohawkMetaEngine_Myst::registerDefaultSettings() {
ConfMan.registerDefault("playmystflyby", false);

0
engines/mohawk/myst_metaengine/metaengine.h → engines/mohawk/myst_metaengine.h
View File

2
engines/mohawk/riven.cpp
View File

@ -58,7 +58,7 @@
#include "mohawk/console.h"
// Shared code between detection/engine.
#include "mohawk/riven_metaengine/metaengine.h"
#include "mohawk/riven_metaengine.h"
namespace Mohawk {

2
engines/mohawk/riven_graphics.h
View File

@ -24,7 +24,7 @@
#define MOHAWK_RIVEN_GRAPHICS_H
#include "mohawk/graphics.h"
#include "mohawk/riven_metaengine/graphics_detection_enums.h"
#include "mohawk/riven_graphics_detection_enums.h"
#include "common/ustr.h"

0
engines/mohawk/riven_metaengine/graphics_detection_enums.h → engines/mohawk/riven_graphics_detection_enums.h
View File

4
engines/mohawk/riven_metaengine/metaengine.cpp → engines/mohawk/riven_metaengine.cpp
View File

@ -20,8 +20,8 @@
*
*/
#include "mohawk/riven_metaengine/metaengine.h"
#include "mohawk/riven_metaengine/graphics_detection_enums.h"
#include "mohawk/riven_metaengine.h"
#include "mohawk/riven_graphics_detection_enums.h"
void Mohawk::MohawkMetaEngine_Riven::registerDefaultSettings() {
ConfMan.registerDefault("zip_mode", false);

0
engines/mohawk/riven_metaengine/metaengine.h → engines/mohawk/riven_metaengine.h
View File