From: sparky4 <sparky4@cock.li>
Date: Fri, 4 Dec 2015 16:34:29 +0000 (-0600)
Subject: ok conversion has began wwww sorry for long delay ^^
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=419b0a69cffced29a4ac169c5f243f83e8fe9d13;hp=1f99509934a310d04ca20169a996787ee730070f;p=16.git

ok conversion has began wwww sorry for long delay ^^
---

diff --git a/16/xw/makefile b/16/xw/makefile
index d3ad8b71..298ec301 100755
--- a/16/xw/makefile
+++ b/16/xw/makefile
@@ -2,68 +2,121 @@
 # MODEX library makefile (for Borland MAKE)
 # Copyright (c) 1993,1994 by Alessandro Scotti
 #
-LIBINCS = MODEX.DEF
+!ifdef __LINUX__
+REMOVECOMMAND=rm -f
+COPYCOMMAND=cp -f
+DIRSEP=/
+OBJ=o
+!else
+REMOVECOMMAND=del
+COPYCOMMAND=copy /y
+DIRSEP=\
+OBJ=obj
+!endif
+LIBINCS = modex.def
 
-LIBOBJS = MXBB.OBJ \
-          MXCC.OBJ \
-          MXCG.OBJ \
-          MXCL.OBJ \
-          MXCR.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
+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)
 
 #
 # ASM compiler
 #
-ASMC = tasm
-ASMO = /m5 /p
+ASMC =wasm
+ASMO =-mh -0
 
 #
 # PAS compiler
 #
-PASC = tpc
-PASO = /m -$D- -$L- -$S-
+#PASC = tpc
+#PASO = /m -$D- -$L- -$S-
 
 #
 # LIB maker, uses response file
 #
-LIBC = tlib
+LIBC = wlib
 
-.asm.obj:
-        $(ASMC) $(ASMO) $<
+# .asm.obj:
+# 		$(ASMC) $(ASMO) $<
 
-target: modex.lib
+mxbb.$(OBJ): mxbb.asm
+	$(ASMC) $(ASMO) mxbb.asm
+mxcc.$(OBJ): mxcc.asm
+	$(ASMC) $(ASMO) mxcc.asm
+mxcg.$(OBJ): mxcg.asm
+	$(ASMC) $(ASMO) mxcg.asm
+mxcl.$(OBJ): mxcl.asm
+	$(ASMC) $(ASMO) mxcl.asm
+mxcr.$(OBJ): mxcr.asm
+	$(ASMC) $(ASMO) mxcr.asm
+mxel.$(OBJ): mxel.asm
+	$(ASMC) $(ASMO) mxel.asm
+mxfb.$(OBJ): mxfb.asm
+	$(ASMC) $(ASMO) mxfb.asm
+mxfp.$(OBJ): mxfp.asm
+	$(ASMC) $(ASMO) mxfp.asm
+mxgc.$(OBJ): mxgc.asm
+	$(ASMC) $(ASMO) mxgc.asm
+mxgi.$(OBJ): mxgi.asm
+	$(ASMC) $(ASMO) mxgi.asm
+mxgm.$(OBJ): mxgm.asm
+	$(ASMC) $(ASMO) mxgm.asm
+mxgp.$(OBJ): mxgp.asm
+	$(ASMC) $(ASMO) mxgp.asm
+mxgv.$(OBJ): mxgv.asm
+	$(ASMC) $(ASMO) mxgv.asm
+mxhl.$(OBJ): mxhl.asm
+	$(ASMC) $(ASMO) mxhl.asm
+mxit.$(OBJ): mxit.asm
+	$(ASMC) $(ASMO) mxit.asm
+mxll.$(OBJ): mxll.asm
+	$(ASMC) $(ASMO) mxll.asm
+mxln.$(OBJ): mxln.asm
+	$(ASMC) $(ASMO) mxln.asm
+mxot.$(OBJ): mxot.asm
+	$(ASMC) $(ASMO) mxot.asm
+mxpb.$(OBJ): mxpb.asm
+	$(ASMC) $(ASMO) mxpb.asm
+mxpf.$(OBJ): mxpf.asm
+	$(ASMC) $(ASMO) mxpf.asm
+mxpg.$(OBJ): mxpg.asm
+	$(ASMC) $(ASMO) mxpg.asm
+mxpi.$(OBJ): mxpi.asm
+	$(ASMC) $(ASMO) mxpi.asm
+mxpn.$(OBJ): mxpn.asm
+	$(ASMC) $(ASMO) mxpn.asm
+mxpp.$(OBJ): mxpp.asm
+	$(ASMC) $(ASMO) mxpp.asm
+mxra.$(OBJ): mxra.asm
+	$(ASMC) $(ASMO) mxra.asm
+mxrp.$(OBJ): mxrp.asm
+	$(ASMC) $(ASMO) mxrp.asm
+mxsa.$(OBJ): mxsa.asm
+	$(ASMC) $(ASMO) mxsa.asm
+mxsc.$(OBJ): mxsc.asm
+	$(ASMC) $(ASMO) mxsc.asm
+mxsi.$(OBJ): mxsi.asm
+	$(ASMC) $(ASMO) mxsi.asm
+mxsl.$(OBJ): mxsl.asm
+	$(ASMC) $(ASMO) mxsl.asm
+mxsm.$(OBJ): mxsm.asm
+	$(ASMC) $(ASMO) mxsm.asm
+mxsp.$(OBJ): mxsp.asm
+	$(ASMC) $(ASMO) mxsp.asm
+mxss.$(OBJ): mxss.asm
+	$(ASMC) $(ASMO) mxss.asm
+mxtl.$(OBJ): mxtl.asm
+	$(ASMC) $(ASMO) mxtl.asm
+mxvs.$(OBJ): mxvs.asm
+	$(ASMC) $(ASMO) mxvs.asm
+mxwd.$(OBJ): mxwd.asm
+	$(ASMC) $(ASMO) mxwd.asm
+mxwm.$(OBJ): mxwm.asm
+	$(ASMC) $(ASMO) mxwm.asm
+mxwp.$(OBJ): mxwp.asm
+	$(ASMC) $(ASMO) mxwp.asm
+mxwr.$(OBJ): mxwr.asm
+	$(ASMC) $(ASMO) mxwr.asm
+
+all: $(LIBOBJS) modex.lib
 # modex.tpu modex.tpp
 
 #modex.tpu: $(LIBOBJS) modex.pas
@@ -76,6 +129,6 @@ target: modex.lib
 #        copy modex.tpp ..
 
 modex.lib: modex.lbr $(LIBOBJS)
-        $(LIBC) modex.lib @modex.lbr
+	$(LIBC) modex.lib @modex.lbr
 
 $(LIBOBJS):   modex.def
diff --git a/16/xw/makefile.bcc b/16/xw/makefile.bcc
new file mode 100755
index 00000000..d3ad8b71
--- /dev/null
+++ b/16/xw/makefile.bcc
@@ -0,0 +1,81 @@
+#
+# MODEX library makefile (for Borland MAKE)
+# Copyright (c) 1993,1994 by Alessandro Scotti
+#
+LIBINCS = MODEX.DEF
+
+LIBOBJS = MXBB.OBJ \
+          MXCC.OBJ \
+          MXCG.OBJ \
+          MXCL.OBJ \
+          MXCR.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
+
+#
+# ASM compiler
+#
+ASMC = tasm
+ASMO = /m5 /p
+
+#
+# PAS compiler
+#
+PASC = tpc
+PASO = /m -$D- -$L- -$S-
+
+#
+# LIB maker, uses response file
+#
+LIBC = tlib
+
+.asm.obj:
+        $(ASMC) $(ASMO) $<
+
+target: modex.lib
+# modex.tpu modex.tpp
+
+#modex.tpu: $(LIBOBJS) modex.pas
+#        $(PASC) $(PASO) modex
+#        copy modex.tpu ..
+#        copy modex.pas ..
+
+#modex.tpp: $(LIBOBJS) modex.pas
+#        $(PASC) /cp $(PASO) modex
+#        copy modex.tpp ..
+
+modex.lib: modex.lbr $(LIBOBJS)
+        $(LIBC) modex.lib @modex.lbr
+
+$(LIBOBJS):   modex.def
diff --git a/16/xw/modex.def b/16/xw/modex.def
index 45bd900f..7977a4a0 100755
--- a/16/xw/modex.def
+++ b/16/xw/modex.def
@@ -3,8 +3,8 @@
 ; MODEX.DEF - Include file
 ; Copyright (c) 1993-1994 by Alessandro Scotti
 ;
-JUMPS
-LOCALS
+;JUMPS
+;LOCALS
 
 TRUE            EQU     1       ; Boolean constants
 FALSE           EQU     0
@@ -111,53 +111,53 @@ ENDM
 
 ;------------------------------------------------------------
 ;
-.leave  MACRO   argsize
-    IF USE286 EQ TRUE
-        leave
-    ELSE
-        mov     sp, bp
-        pop     bp
-    ENDIF
-    IFNB <argspace>
-        ret     argsize
-    ELSE
-        ret
-    ENDIF
-ENDM
+;.leave  MACRO   argsize
+;    IF USE286 EQ TRUE
+;        leave
+;    ELSE
+;        mov     sp, bp
+;        pop     bp
+;    ENDIF
+;    IFNB <argspace>
+;        ret     argsize
+;    ELSE
+;        ret
+;    ENDIF
+;ENDM
 
 ;------------------------------------------------------------
 ;
-.shr    MACRO   arg, count
-    IF USE286 EQ TRUE
-        shr     arg, count
-    ELSE
-        $temp = count
-        WHILE $temp GT 0
-            shr arg, 1
-            $temp = $temp-1
-        ENDM
-    ENDIF
-ENDM
+;.shr    MACRO   arg, count
+;    IF USE286 EQ TRUE
+;        shr     arg, count
+;    ELSE
+;        $temp = count
+;        WHILE $temp GT 0
+;            shr arg, 1
+;            $temp = $temp-1
+;        ENDM
+;    ENDIF
+;ENDM
 
 ;------------------------------------------------------------
 ;
-.shl    MACRO   arg, count
-    IF USE286 EQ TRUE
-        shl     arg, count
-    ELSE
-        $temp = count
-        WHILE $temp GT 0
-            shl arg, 1
-            $temp = $temp-1
-        ENDM
-    ENDIF
-ENDM
+;.shl    MACRO   arg, count
+;    IF USE286 EQ TRUE
+;        shl     arg, count
+;    ELSE
+;        $temp = count
+;        WHILE $temp GT 0
+;            shl arg, 1
+;            $temp = $temp-1
+;        ENDM
+;    ENDIF
+;ENDM
 
 ;------------------------------------------------------------
 ;
-.chk386 MACRO   name, jump
-    IF USE386 EQ FALSE
-        .OUT    "Warning: ", <name>, " needs a 386 or better to run!"
-        jmp     @@jump
-    ENDIF
-ENDM
+;.chk386 MACRO   name, jump
+;    IF USE386 EQ FALSE
+;        .OUT    "Warning: ", <name>, " needs a 386 or better to run!"
+;        jmp     @@jump
+;    ENDIF
+;ENDM
diff --git a/16/xw/mxbb.asm b/16/xw/mxbb.asm
index ac6668ce..190fa7b2 100755
--- a/16/xw/mxbb.asm
+++ b/16/xw/mxbb.asm
@@ -4,9 +4,9 @@
 ; Copyright (c) 1993,1994 by Alessandro Scotti
 ;
 ;-----------------------------------------------------------
-WARN    PRO
-NOWARN  RES
-INCLUDE MODEX.DEF
+;WARN    PRO
+;NOWARN  RES
+INCLUDE modex.def
 
 PUBLIC  mxBitBlt
 
diff --git a/makefile b/makefile
index 2b458453..c0f971a1 100755
--- 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 6dbf027e..8e9cad2c 100755
Binary files a/tesuto.exe and b/tesuto.exe differ