From d5a39ff6469f8762218c00a34f4b0a120a56332b Mon Sep 17 00:00:00 2001
From: "N.N." <krzyszcz@users.sourceforge.net>
Date: Wed, 8 Dec 2004 15:40:14 +0000
Subject: various bug-fixes, maxmode, toxy .#args

svn path=/trunk/externals/miXed/; revision=2360
---
 ViCious/cyclone/makefile  | 21 +++++++++++++++------
 ViCious/cyclone/objects   | 20 +++++++++++---------
 ViCious/cyclone/snapfiles |  1 +
 ViCious/toxy/snapfiles    |  3 ++-
 4 files changed, 29 insertions(+), 16 deletions(-)

(limited to 'ViCious')

diff --git a/ViCious/cyclone/makefile b/ViCious/cyclone/makefile
index 68fc15c..6fcc05f 100644
--- a/ViCious/cyclone/makefile
+++ b/ViCious/cyclone/makefile
@@ -25,7 +25,7 @@ LIBS = $(VCLIBDIR)\libc.lib \
 !INCLUDE snapfiles
 !INCLUDE $(SRCDIR)\build_counter
 
-cyclone: cyclone.dll hammer.dll sickle.dll dummies.dll cyclist.exe
+cyclone: cyclone.dll hammer.dll sickle.dll dummies.dll maxmode.dll cyclist.exe
 	@cd $(ROOTDIR)
 	@$(ZIPCOMMAND) cyclone-$(CYCLONE_SNAPSHOT).zip $(SNAPFILES)
 
@@ -57,12 +57,21 @@ dummies.dll: $(DUMMIES_OBJECTS)
 	-del $(@:.dll=.exp)
 	-del $(@:.dll=.lib)
 
-cyclist.exe: $(SHAREDDIR)\common\binport.c
-	-del /S $(SHAREDDIR)\common\binport.obj
-	-cl $(CFLAGS) $(INCLUDES) /DBINPORT_STANDALONE /o $@ \
-		$(VCLIBDIR)\libc.lib $(SHAREDDIR)\common\binport.c
+maxmode.dll: $(MAXMODE_OBJECTS)
+	-link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup)
+	-@copy $@ $(EXTDIR)
+	-@move $@ $(BINDIR)
+	-del $(@:.dll=.exp)
+	-del $(@:.dll=.lib)
+
+cyclist.exe: $(SHAREDDIR)\common\binport.c \
+	$(SHAREDDIR)\common\lex.c $(SHAREDDIR)\unstable\standalone.c
+	-del /S $(SHAREDDIR)\common\binport.obj $(SHAREDDIR)\common\lex.obj
+	-cl $(CFLAGS) $(INCLUDES) /DMIXED_STANDALONE /o $@ \
+		$(VCLIBDIR)\libc.lib $(SHAREDDIR)\common\binport.c \
+		$(SHAREDDIR)\common\lex.c $(SHAREDDIR)\unstable\standalone.c
 	-@move $@ $(BINDIR)
-	-del /S binport.obj
+	-del /S binport.obj lex.obj
 
 .c.obj: ; cl /c $(CFLAGS) $(INCLUDES) /Fo$*.obj $*.c
 
diff --git a/ViCious/cyclone/objects b/ViCious/cyclone/objects
index 1790c79..c74d47b 100644
--- a/ViCious/cyclone/objects
+++ b/ViCious/cyclone/objects
@@ -3,6 +3,7 @@ CYCLONE_OBJECTS = \
 	$(SRCDIR)\shadow\nettles.obj \
 	$(SHAREDDIR)\common\loud.obj \
 	$(SHAREDDIR)\common\grow.obj \
+	$(SHAREDDIR)\common\lex.obj \
 	$(SHAREDDIR)\common\binport.obj \
 	$(SHAREDDIR)\common\port.obj \
 	$(SHAREDDIR)\hammer\file.obj \
@@ -98,9 +99,8 @@ HAMMER_OBJECTS = $(ALL_HAMMERS) \
 	$(SHAREDDIR)\common\grow.obj \
 	$(SHAREDDIR)\common\rand.obj \
 	$(SHAREDDIR)\common\vefl.obj \
-	$(SHAREDDIR)\common\sq.obj \
-	$(SHAREDDIR)\common\bifi.obj \
 	$(SHAREDDIR)\common\mifi.obj \
+	$(SHAREDDIR)\common\lex.obj \
 	$(SHAREDDIR)\common\binport.obj \
 	$(SHAREDDIR)\common\port.obj \
 	$(SHAREDDIR)\hammer\file.obj \
@@ -108,8 +108,7 @@ HAMMER_OBJECTS = $(ALL_HAMMERS) \
 	$(SHAREDDIR)\hammer\tree.obj \
 	$(SHAREDDIR)\unstable\forky.obj \
 	$(SHAREDDIR)\unstable\fragile.obj \
-	$(SHAREDDIR)\unstable\fringe.obj \
-	$(SHAREDDIR)\unstable\loader.obj
+	$(SHAREDDIR)\unstable\fringe.obj
 
 ALL_SICKLES = \
 	$(SRCDIR)\sickle\abs.obj \
@@ -195,6 +194,8 @@ SICKLE_OBJECTS = $(ALL_SICKLES) \
 	$(SHAREDDIR)\common\loud.obj \
 	$(SHAREDDIR)\common\grow.obj \
 	$(SHAREDDIR)\common\vefl.obj \
+	$(SHAREDDIR)\common\clc.obj \
+	$(SHAREDDIR)\common\lex.obj \
 	$(SHAREDDIR)\common\binport.obj \
 	$(SHAREDDIR)\common\port.obj \
 	$(SHAREDDIR)\hammer\file.obj \
@@ -202,19 +203,20 @@ SICKLE_OBJECTS = $(ALL_SICKLES) \
 	$(SHAREDDIR)\sickle\arsic.obj \
 	$(SHAREDDIR)\unstable\forky.obj \
 	$(SHAREDDIR)\unstable\fragile.obj \
-	$(SHAREDDIR)\unstable\fringe.obj \
-	$(SHAREDDIR)\unstable\loader.obj
+	$(SHAREDDIR)\unstable\fringe.obj
 
 DUMMIES_OBJECTS = \
 	$(SRCDIR)\shadow\dummies.obj \
 	$(SHAREDDIR)\common\loud.obj \
 	$(SHAREDDIR)\common\grow.obj \
+	$(SHAREDDIR)\common\lex.obj \
 	$(SHAREDDIR)\common\binport.obj \
 	$(SHAREDDIR)\common\port.obj \
 	$(SHAREDDIR)\unstable\forky.obj \
 	$(SHAREDDIR)\unstable\fragile.obj \
 	$(SHAREDDIR)\unstable\fringe.obj
 
-CYCLIST_OBJECTS = \
-	$(SHAREDDIR)\common\binport.obj
-
+MAXMODE_OBJECTS = \
+	$(SRCDIR)\shadow\maxmode.obj \
+	$(SHAREDDIR)\common\loud.obj \
+	$(SHAREDDIR)\unstable\loader.obj
diff --git a/ViCious/cyclone/snapfiles b/ViCious/cyclone/snapfiles
index d5ce6de..d2b2a2f 100644
--- a/ViCious/cyclone/snapfiles
+++ b/ViCious/cyclone/snapfiles
@@ -3,6 +3,7 @@ SNAPFILES = \
 	miXed\bin\hammer.dll \
 	miXed\bin\sickle.dll \
 	miXed\bin\dummies.dll \
+	miXed\bin\maxmode.dll \
 	miXed\bin\cyclist.exe \
 	miXed\ViCious\cyclone\makefile \
 	miXed\ViCious\cyclone\objects \
diff --git a/ViCious/toxy/snapfiles b/ViCious/toxy/snapfiles
index d83b373..301180a 100644
--- a/ViCious/toxy/snapfiles
+++ b/ViCious/toxy/snapfiles
@@ -6,4 +6,5 @@ SNAPFILES = \
 	miXed\ViCious\toxy\objects \
 	miXed\ViCious\toxy\snapfiles \
 	miXed\LICENSE.txt \
-	miXed\test\toxy\*.*
+	miXed\test\toxy*.* \
+	miXed\test\toxy\stress\*.*
-- 
cgit v1.2.1