diff options
| -rw-r--r-- | engines/glk/jacl/detection.cpp | 8 | ||||
| -rw-r--r-- | engines/glk/jacl/detection.h | 8 | ||||
| -rw-r--r-- | engines/glk/jacl/detection_tables.h | 6 | ||||
| -rw-r--r-- | engines/glk/jacl/jacl.cpp | 2 | ||||
| -rw-r--r-- | engines/glk/jacl/jacl.h | 2 | ||||
| -rw-r--r-- | engines/glk/module.mk | 15 |
6 files changed, 28 insertions, 13 deletions
diff --git a/engines/glk/jacl/detection.cpp b/engines/glk/jacl/detection.cpp index 63d0485fa7..d0e6f344b5 100644 --- a/engines/glk/jacl/detection.cpp +++ b/engines/glk/jacl/detection.cpp @@ -22,10 +22,10 @@ #include "glk/jacl/detection.h" #include "glk/jacl/detection_tables.h" -#include "common/debug.h" -#include "common/file.h" -#include "common/md5.h" -#include "engines/game.h" +#include "glk/jacl/common/debug.h" +#include "glk/jacl/common/file.h" +#include "glk/jacl/common/md5.h" +#include "glk/jacl/engines/game.h" namespace Glk { namespace JACL { diff --git a/engines/glk/jacl/detection.h b/engines/glk/jacl/detection.h index f576b66906..b93ea36422 100644 --- a/engines/glk/jacl/detection.h +++ b/engines/glk/jacl/detection.h @@ -23,10 +23,10 @@ #ifndef JACL_DETECTION #define JACL_DETECTION -#include "common/fs.h" -#include "common/hash-str.h" -#include "engines/game.h" -#include "glk/detection.h" +#include "glk/jacl/common/fs.h" +#include "glk/jacl/common/hash-str.h" +#include "glk/jacl/engines/game.h" +#include "glk/jacl/glk/detection.h" namespace Glk { namespace JACL { diff --git a/engines/glk/jacl/detection_tables.h b/engines/glk/jacl/detection_tables.h index a5d7b03b6f..d5f86c8f1c 100644 --- a/engines/glk/jacl/detection_tables.h +++ b/engines/glk/jacl/detection_tables.h @@ -20,9 +20,9 @@ * */ -#include "engines/game.h" -#include "common/gui_options.h" -#include "common/language.h" +#include "glk/jacl/engines/game.h" +#include "glk/jacl/common/gui_options.h" +#include "glk/jacl/common/language.h" namespace Glk { namespace JACL { diff --git a/engines/glk/jacl/jacl.cpp b/engines/glk/jacl/jacl.cpp index 998a3fc5e8..0178b1ce31 100644 --- a/engines/glk/jacl/jacl.cpp +++ b/engines/glk/jacl/jacl.cpp @@ -21,7 +21,7 @@ */ #include "glk/jacl/jacl.h" -#include "common/config-manager.h" +#include "glk/jacl/common/config-manager.h" namespace Glk { namespace JACL { diff --git a/engines/glk/jacl/jacl.h b/engines/glk/jacl/jacl.h index 49def8fd11..ce04c890e5 100644 --- a/engines/glk/jacl/jacl.h +++ b/engines/glk/jacl/jacl.h @@ -28,6 +28,8 @@ namespace Glk { namespace JACL { +#define GLK + /** * JACL game interpreter */ diff --git a/engines/glk/module.mk b/engines/glk/module.mk index 0082631539..5cdb9b1933 100644 --- a/engines/glk/module.mk +++ b/engines/glk/module.mk @@ -178,7 +178,20 @@ MODULE_OBJS := \ hugo/hugo.o \ hugo/stringfn.o \ jacl/detection.o \ - jacl/jacl.o \ + jacl/display.o \ + jacl/encapsulate.o \ + jacl/errors.o \ + jacl/findroute.o \ + jacl/glk_saver.o \ + jacl/glk_startup.o \ + jacl/interpreter.o \ + jacl/jpp.o \ + jacl/libcsv.o \ + jacl/loader.o \ + jacl/logging.o \ + jacl/parser.o \ + jacl/resolvers.o \ + jacl/utils.o \ magnetic/detection.o \ magnetic/emu.o \ magnetic/graphics.o \ |