1 files changed, 14 insertions, 1 deletions
diff --git a/src/casm.c b/src/casm.c
index 1340eb7..7624978 100644
--- a/src/casm.c
+++ b/src/casm.c
@@ -37,11 +37,14 @@
 #include "cmd.h"
 #include "state.h"
 #include "codepage.h"
-#include "output.h"
 #include "stack.h"
 #include "listing.h"
 #include "alias.h"
 
+#include "output.h"
+#include "rawout.h"
+#include "specout.h"
+
 /* ---------------------------------------- PROCESSORS
 */
 #include "z80.h"
@@ -375,6 +378,8 @@ static CommandStatus OPTION(const char *label, int argc, char *argv[],
         opt = argv[1];
     }
 
+    /* TODO: There should be someway to make this better
+    */
     if ((entry = ParseTable(opt, ListOptions())))
     {
         return ListSetOption(entry->value, ac, args, q, err, errsize);
@@ -391,6 +396,14 @@ static CommandStatus OPTION(const char *label, int argc, char *argv[],
     {
         return OutputSetOption(entry->value, ac, args, q, err, errsize);
     }
+    else if ((entry = ParseTable(opt, RawOutputOptions())))
+    {
+        return RawOutputSetOption(entry->value, ac, args, q, err, errsize);
+    }
+    else if ((entry = ParseTable(opt, SpecTAPOutputOptions())))
+    {
+        return SpecTAPOutputSetOption(entry->value, ac, args, q, err, errsize);
+    }
     else if ((entry = ParseTable(opt, cpu->options())))
     {
         return cpu->set_option(entry->value, ac, args, q, err, errsize);