ok conversion has began wwww sorry for long delay ^^

diff --git a/16/xw/makefile b/16/xw/makefile
index d3ad8b715b547bbd93640ce23bd4758cb3ae98c7..298ec3019b63b7cd59214d7f3cf860ad8f7e59c2 100755 (executable)
--- a/16/xw/makefile
+++ b/16/xw/makefile
@@ -2,68 +2,121 @@
 # MODEX library makefile (for Borland MAKE)\r
 # Copyright (c) 1993,1994 by Alessandro Scotti\r
 #\r
-LIBINCS = MODEX.DEF\r
+!ifdef __LINUX__\r
+REMOVECOMMAND=rm -f\r
+COPYCOMMAND=cp -f\r
+DIRSEP=/\r
+OBJ=o\r
+!else\r
+REMOVECOMMAND=del\r
+COPYCOMMAND=copy /y\r
+DIRSEP=\\r
+OBJ=obj\r
+!endif\r
+LIBINCS = modex.def\r
 \r
-LIBOBJS = MXBB.OBJ \\r
-          MXCC.OBJ \\r
-          MXCG.OBJ \\r
-          MXCL.OBJ \\r
-          MXCR.OBJ \\r
-          MXFB.OBJ \\r
-          MXFP.OBJ \\r
-          MXGC.OBJ \\r
-          MXGI.OBJ \\r
-          MXGM.OBJ \\r
-          MXGP.OBJ \\r
-          MXGV.OBJ \\r
-          MXHL.OBJ \\r
-          MXIT.OBJ \\r
-          MXLL.OBJ \\r
-          MXLN.OBJ \\r
-          MXOT.OBJ \\r
-          MXPB.OBJ \\r
-          MXPF.OBJ \\r
-          MXPG.OBJ \\r
-          MXPI.OBJ \\r
-          MXPN.OBJ \\r
-          MXPP.OBJ \\r
-          MXRA.OBJ \\r
-          MXRP.OBJ \\r
-          MXSA.OBJ \\r
-          MXSC.OBJ \\r
-          MXSI.OBJ \\r
-          MXSL.OBJ \\r
-          MXSM.OBJ \\r
-          MXSP.OBJ \\r
-          MXSS.OBJ \\r
-          MXTL.OBJ \\r
-          MXVS.OBJ \\r
-          MXWD.OBJ \\r
-          MXWM.OBJ \\r
-          MXWP.OBJ \\r
-          MXWR.OBJ\r
+LIBOBJS = mxbb.$(OBJ) mxcc.$(OBJ) mxcg.$(OBJ) mxcl.$(OBJ) mxcr.$(OBJ) mxel.$(OBJ) mxfb.$(OBJ) mxfp.$(OBJ) mxgc.$(OBJ) mxgi.$(OBJ) mxgm.$(OBJ) mxgp.$(OBJ) mxgv.$(OBJ) mxhl.$(OBJ) mxit.$(OBJ) mxll.$(OBJ) mxln.$(OBJ) mxot.$(OBJ) mxpb.$(OBJ) mxpf.$(OBJ) mxpg.$(OBJ) mxpi.$(OBJ) mxpn.$(OBJ) mxpp.$(OBJ) mxra.$(OBJ) mxrp.$(OBJ) mxsa.$(OBJ) mxsc.$(OBJ) mxsi.$(OBJ) mxsl.$(OBJ) mxsm.$(OBJ) mxsp.$(OBJ) mxss.$(OBJ) mxtl.$(OBJ) mxvs.$(OBJ) mxwd.$(OBJ) mxwm.$(OBJ) mxwp.$(OBJ) mxwr.$(OBJ)\r
 \r
 #\r
 # ASM compiler\r
 #\r
-ASMC = tasm\r
-ASMO = /m5 /p\r
+ASMC =wasm\r
+ASMO =-mh -0\r
 \r
 #\r
 # PAS compiler\r
 #\r
-PASC = tpc\r
-PASO = /m -$D- -$L- -$S-\r
+#PASC = tpc\r
+#PASO = /m -$D- -$L- -$S-\r
 \r
 #\r
 # LIB maker, uses response file\r
 #\r
-LIBC = tlib\r
+LIBC = wlib\r
 \r
-.asm.obj:\r
-        $(ASMC) $(ASMO) $<\r
+# .asm.obj:\r
+#              $(ASMC) $(ASMO) $<\r
 \r
-target: modex.lib
+mxbb.$(OBJ): mxbb.asm\r
+       $(ASMC) $(ASMO) mxbb.asm\r
+mxcc.$(OBJ): mxcc.asm\r
+       $(ASMC) $(ASMO) mxcc.asm\r
+mxcg.$(OBJ): mxcg.asm\r
+       $(ASMC) $(ASMO) mxcg.asm\r
+mxcl.$(OBJ): mxcl.asm\r
+       $(ASMC) $(ASMO) mxcl.asm\r
+mxcr.$(OBJ): mxcr.asm\r
+       $(ASMC) $(ASMO) mxcr.asm\r
+mxel.$(OBJ): mxel.asm\r
+       $(ASMC) $(ASMO) mxel.asm\r
+mxfb.$(OBJ): mxfb.asm\r
+       $(ASMC) $(ASMO) mxfb.asm\r
+mxfp.$(OBJ): mxfp.asm\r
+       $(ASMC) $(ASMO) mxfp.asm\r
+mxgc.$(OBJ): mxgc.asm\r
+       $(ASMC) $(ASMO) mxgc.asm\r
+mxgi.$(OBJ): mxgi.asm\r
+       $(ASMC) $(ASMO) mxgi.asm\r
+mxgm.$(OBJ): mxgm.asm\r
+       $(ASMC) $(ASMO) mxgm.asm\r
+mxgp.$(OBJ): mxgp.asm\r
+       $(ASMC) $(ASMO) mxgp.asm\r
+mxgv.$(OBJ): mxgv.asm\r
+       $(ASMC) $(ASMO) mxgv.asm\r
+mxhl.$(OBJ): mxhl.asm\r
+       $(ASMC) $(ASMO) mxhl.asm\r
+mxit.$(OBJ): mxit.asm\r
+       $(ASMC) $(ASMO) mxit.asm\r
+mxll.$(OBJ): mxll.asm\r
+       $(ASMC) $(ASMO) mxll.asm\r
+mxln.$(OBJ): mxln.asm\r
+       $(ASMC) $(ASMO) mxln.asm\r
+mxot.$(OBJ): mxot.asm\r
+       $(ASMC) $(ASMO) mxot.asm\r
+mxpb.$(OBJ): mxpb.asm\r
+       $(ASMC) $(ASMO) mxpb.asm\r
+mxpf.$(OBJ): mxpf.asm\r
+       $(ASMC) $(ASMO) mxpf.asm\r
+mxpg.$(OBJ): mxpg.asm\r
+       $(ASMC) $(ASMO) mxpg.asm\r
+mxpi.$(OBJ): mxpi.asm\r
+       $(ASMC) $(ASMO) mxpi.asm\r
+mxpn.$(OBJ): mxpn.asm\r
+       $(ASMC) $(ASMO) mxpn.asm\r
+mxpp.$(OBJ): mxpp.asm\r
+       $(ASMC) $(ASMO) mxpp.asm\r
+mxra.$(OBJ): mxra.asm\r
+       $(ASMC) $(ASMO) mxra.asm\r
+mxrp.$(OBJ): mxrp.asm\r
+       $(ASMC) $(ASMO) mxrp.asm\r
+mxsa.$(OBJ): mxsa.asm\r
+       $(ASMC) $(ASMO) mxsa.asm\r
+mxsc.$(OBJ): mxsc.asm\r
+       $(ASMC) $(ASMO) mxsc.asm\r
+mxsi.$(OBJ): mxsi.asm\r
+       $(ASMC) $(ASMO) mxsi.asm\r
+mxsl.$(OBJ): mxsl.asm\r
+       $(ASMC) $(ASMO) mxsl.asm\r
+mxsm.$(OBJ): mxsm.asm\r
+       $(ASMC) $(ASMO) mxsm.asm\r
+mxsp.$(OBJ): mxsp.asm\r
+       $(ASMC) $(ASMO) mxsp.asm\r
+mxss.$(OBJ): mxss.asm\r
+       $(ASMC) $(ASMO) mxss.asm\r
+mxtl.$(OBJ): mxtl.asm\r
+       $(ASMC) $(ASMO) mxtl.asm\r
+mxvs.$(OBJ): mxvs.asm\r
+       $(ASMC) $(ASMO) mxvs.asm\r
+mxwd.$(OBJ): mxwd.asm\r
+       $(ASMC) $(ASMO) mxwd.asm\r
+mxwm.$(OBJ): mxwm.asm\r
+       $(ASMC) $(ASMO) mxwm.asm\r
+mxwp.$(OBJ): mxwp.asm\r
+       $(ASMC) $(ASMO) mxwp.asm\r
+mxwr.$(OBJ): mxwr.asm\r
+       $(ASMC) $(ASMO) mxwr.asm\r
+\r
+all: $(LIBOBJS) modex.lib\r
 # modex.tpu modex.tpp\r
 \r
 #modex.tpu: $(LIBOBJS) modex.pas\r
@@ -76,6 +129,6 @@ target: modex.lib
 #        copy modex.tpp ..\r
 \r
 modex.lib: modex.lbr $(LIBOBJS)\r
-        $(LIBC) modex.lib @modex.lbr\r
+       $(LIBC) modex.lib @modex.lbr\r
 \r
 $(LIBOBJS):   modex.def\r

diff --git a/16/xw/makefile.bcc b/16/xw/makefile.bcc
new file mode 100755 (executable)
index 0000000..d3ad8b7
--- /dev/null
+++ b/16/xw/makefile.bcc
@@ -0,0 +1,81 @@
+#\r
+# MODEX library makefile (for Borland MAKE)\r
+# Copyright (c) 1993,1994 by Alessandro Scotti\r
+#\r
+LIBINCS = MODEX.DEF\r
+\r
+LIBOBJS = MXBB.OBJ \\r
+          MXCC.OBJ \\r
+          MXCG.OBJ \\r
+          MXCL.OBJ \\r
+          MXCR.OBJ \\r
+          MXFB.OBJ \\r
+          MXFP.OBJ \\r
+          MXGC.OBJ \\r
+          MXGI.OBJ \\r
+          MXGM.OBJ \\r
+          MXGP.OBJ \\r
+          MXGV.OBJ \\r
+          MXHL.OBJ \\r
+          MXIT.OBJ \\r
+          MXLL.OBJ \\r
+          MXLN.OBJ \\r
+          MXOT.OBJ \\r
+          MXPB.OBJ \\r
+          MXPF.OBJ \\r
+          MXPG.OBJ \\r
+          MXPI.OBJ \\r
+          MXPN.OBJ \\r
+          MXPP.OBJ \\r
+          MXRA.OBJ \\r
+          MXRP.OBJ \\r
+          MXSA.OBJ \\r
+          MXSC.OBJ \\r
+          MXSI.OBJ \\r
+          MXSL.OBJ \\r
+          MXSM.OBJ \\r
+          MXSP.OBJ \\r
+          MXSS.OBJ \\r
+          MXTL.OBJ \\r
+          MXVS.OBJ \\r
+          MXWD.OBJ \\r
+          MXWM.OBJ \\r
+          MXWP.OBJ \\r
+          MXWR.OBJ\r
+\r
+#\r
+# ASM compiler\r
+#\r
+ASMC = tasm\r
+ASMO = /m5 /p\r
+\r
+#\r
+# PAS compiler\r
+#\r
+PASC = tpc\r
+PASO = /m -$D- -$L- -$S-\r
+\r
+#\r
+# LIB maker, uses response file\r
+#\r
+LIBC = tlib\r
+\r
+.asm.obj:\r
+        $(ASMC) $(ASMO) $<\r
+\r
+target: modex.lib
+# modex.tpu modex.tpp\r
+\r
+#modex.tpu: $(LIBOBJS) modex.pas\r
+#        $(PASC) $(PASO) modex\r
+#        copy modex.tpu ..\r
+#        copy modex.pas ..\r
+\r
+#modex.tpp: $(LIBOBJS) modex.pas\r
+#        $(PASC) /cp $(PASO) modex\r
+#        copy modex.tpp ..\r
+\r
+modex.lib: modex.lbr $(LIBOBJS)\r
+        $(LIBC) modex.lib @modex.lbr\r
+\r
+$(LIBOBJS):   modex.def\r

diff --git a/16/xw/modex.def b/16/xw/modex.def
index 45bd900fd75f568e59c75c42d698e5760e5d75b7..7977a4a0819c24ec6883634c7916219eb43197b5 100755 (executable)
--- a/16/xw/modex.def
+++ b/16/xw/modex.def
@@ -3,8 +3,8 @@
 ; MODEX.DEF - Include file\r
 ; Copyright (c) 1993-1994 by Alessandro Scotti\r
 ;\r
-JUMPS\r
-LOCALS\r
+;JUMPS\r
+;LOCALS\r
 \r
 TRUE            EQU     1       ; Boolean constants\r
 FALSE           EQU     0\r
@@ -111,53 +111,53 @@ ENDM
 \r
 ;------------------------------------------------------------\r
 ;\r
-.leave  MACRO   argsize\r
-    IF USE286 EQ TRUE\r
-        leave\r
-    ELSE\r
-        mov     sp, bp\r
-        pop     bp\r
-    ENDIF\r
-    IFNB <argspace>\r
-        ret     argsize\r
-    ELSE\r
-        ret\r
-    ENDIF\r
-ENDM\r
+;.leave  MACRO   argsize\r
+;    IF USE286 EQ TRUE\r
+;        leave\r
+;    ELSE\r
+;        mov     sp, bp\r
+;        pop     bp\r
+;    ENDIF\r
+;    IFNB <argspace>\r
+;        ret     argsize\r
+;    ELSE\r
+;        ret\r
+;    ENDIF\r
+;ENDM\r
 \r
 ;------------------------------------------------------------\r
 ;\r
-.shr    MACRO   arg, count\r
-    IF USE286 EQ TRUE\r
-        shr     arg, count\r
-    ELSE\r
-        $temp = count\r
-        WHILE $temp GT 0\r
-            shr arg, 1\r
-            $temp = $temp-1\r
-        ENDM\r
-    ENDIF\r
-ENDM\r
+;.shr    MACRO   arg, count\r
+;    IF USE286 EQ TRUE\r
+;        shr     arg, count\r
+;    ELSE\r
+;        $temp = count\r
+;        WHILE $temp GT 0\r
+;            shr arg, 1\r
+;            $temp = $temp-1\r
+;        ENDM\r
+;    ENDIF\r
+;ENDM\r
 \r
 ;------------------------------------------------------------\r
 ;\r
-.shl    MACRO   arg, count\r
-    IF USE286 EQ TRUE\r
-        shl     arg, count\r
-    ELSE\r
-        $temp = count\r
-        WHILE $temp GT 0\r
-            shl arg, 1\r
-            $temp = $temp-1\r
-        ENDM\r
-    ENDIF\r
-ENDM\r
+;.shl    MACRO   arg, count\r
+;    IF USE286 EQ TRUE\r
+;        shl     arg, count\r
+;    ELSE\r
+;        $temp = count\r
+;        WHILE $temp GT 0\r
+;            shl arg, 1\r
+;            $temp = $temp-1\r
+;        ENDM\r
+;    ENDIF\r
+;ENDM\r
 \r
 ;------------------------------------------------------------\r
 ;\r
-.chk386 MACRO   name, jump\r
-    IF USE386 EQ FALSE\r
-        .OUT    "Warning: ", <name>, " needs a 386 or better to run!"\r
-        jmp     @@jump\r
-    ENDIF\r
-ENDM\r
+;.chk386 MACRO   name, jump\r
+;    IF USE386 EQ FALSE\r
+;        .OUT    "Warning: ", <name>, " needs a 386 or better to run!"\r
+;        jmp     @@jump\r
+;    ENDIF\r
+;ENDM\r

diff --git a/16/xw/mxbb.asm b/16/xw/mxbb.asm
index ac6668ce230f264a72a7cfc837e7f948ffa6056f..190fa7b270114f2f89fbc99a4ce64986780ed1b8 100755 (executable)
--- a/16/xw/mxbb.asm
+++ b/16/xw/mxbb.asm
@@ -4,9 +4,9 @@
 ; Copyright (c) 1993,1994 by Alessandro Scotti\r
 ;\r
 ;-----------------------------------------------------------\r
-WARN    PRO\r
-NOWARN  RES\r
-INCLUDE MODEX.DEF\r
+;WARN    PRO\r
+;NOWARN  RES\r
+INCLUDE modex.def\r
 \r
 PUBLIC  mxBitBlt\r
 \r

diff --git a/makefile b/makefile
index 2b458453ddee1173acc598dfc735547a3bc4d8d9..c0f971a16d370391101ee427e83886a7c6fd3338 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -66,7 +66,7 @@ SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zq -zc -zp8# -zm
 CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##wwww
-OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
+OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 
@@ -435,3 +435,9 @@ xlib: .symbolic
        @wmake clean
        @wmake all
        cd ../../
+
+mx: .symbolic
+       @cd 16/xw
+#      @wmake clean
+       @wmake all
+       cd ../../

diff --git a/tesuto.exe b/tesuto.exe
index 6dbf027edf2117d3a5a54f2fd40b88760076686f..8e9cad2c76727ec0b778c02dd77d09fc0896e8c5 100755 (executable)
Binary files a/tesuto.exe and b/tesuto.exe differ