4 files changed, 11 insertions, 4 deletions
diff --git a/cyclone/shadow/Makefile b/cyclone/shadow/Makefile
index b700e5e..dc39772 100644
--- a/cyclone/shadow/Makefile
+++ b/cyclone/shadow/Makefile
@@ -2,6 +2,6 @@ ROOT_DIR = ../..
 redefault: default $(ROOT_DIR)/bin/cyclist
 include $(ROOT_DIR)/Makefile.common
 
-$(ROOT_DIR)/bin/cyclist: $(SHARED_DIR)/common/binport.c
-	$(CC) -DBINPORT_STANDALONE -o $@ $<
-
+$(ROOT_DIR)/bin/cyclist: $(SHARED_DIR)/common/binport.c \
+	$(SHARED_DIR)/common/lex.c $(SHARED_DIR)/unstable/standalone.c 
+	$(CC) $(CFLAGS) -DMIXED_STANDALONE -o $@ $^
diff --git a/cyclone/shadow/Makefile.objects b/cyclone/shadow/Makefile.objects
index f1449e0..dd8fb57 100644
--- a/cyclone/shadow/Makefile.objects
+++ b/cyclone/shadow/Makefile.objects
@@ -1,6 +1,7 @@
 SHARED_OBJECTS = \
 common/loud.o \
 common/grow.o \
+common/lex.o \
 common/binport.o \
 common/port.o \
 hammer/file.o \
diff --git a/cyclone/shadow/Makefile.sources b/cyclone/shadow/Makefile.sources
index 061f37b..be9a840 100644
--- a/cyclone/shadow/Makefile.sources
+++ b/cyclone/shadow/Makefile.sources
@@ -1,5 +1,6 @@
 CX_SOURCES = \
 cyclone.c \
+maxmode.c \
 dummies.c
 
 OTHER_SOURCES = \
diff --git a/cyclone/shadow/cyclone.c b/cyclone/shadow/cyclone.c
index 20d1396..a702074 100644
--- a/cyclone/shadow/cyclone.c
+++ b/cyclone/shadow/cyclone.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003 krzYszcz and others.
+/* Copyright (c) 2003-2004 krzYszcz and others.
  * For information on usage and redistribution, and for a DISCLAIMER OF ALL
  * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
 
@@ -122,6 +122,11 @@ void cyclone_setup(void)
 	loud_errand(0, "without having cyclone library preloaded");
 	return;
     }
+    if (zgetfn(&pd_objectmaker, gensym("cyclone")))
+    {
+	loud_error(0, "cyclone is already loaded");
+	return;
+    }
     post("this is cyclone %s, %s %s build",
 	 CYCLONE_VERSION, loud_ordinal(CYCLONE_BUILD), CYCLONE_RELEASE);
     cyclone_class = class_new(gensym("cyclone"),