]> 4ch.mooo.com Git - plz.git/commitdiff
wwww
authorsparky4 <sparky4@cock.li>
Sun, 14 Feb 2016 01:19:13 +0000 (19:19 -0600)
committersparky4 <sparky4@cock.li>
Sun, 14 Feb 2016 01:19:13 +0000 (19:19 -0600)
14 files changed:
asmyt.asm
asmyt.err
asmyt.obj [moved from asmyt.o with 100% similarity]
copper.h
copper.o
copper.obj [new file with mode: 0755]
makefile
plz.h
plz.o [deleted file]
plzpart.map
plzpart.o
tweak.asm
tweak.err
tweak.obj [moved from tweak.o with 100% similarity]

index 7bef947eab8d12ac7270b73f0cb16b1d9e179d23..0c1198c4a6ebfbb7a1b32f83c7fed7110411a82c 100755 (executable)
--- a/asmyt.asm
+++ b/asmyt.asm
@@ -1,6 +1,6 @@
        IDEAL\r
        MODEL huge\r
-       p386\r
+.8087\r
 \r
 EXTRN C l1:word, C l2:word, C l3:word, C l4:word, C k1:word, C k2:word, C k3:word, C k4:word\r
 EXTRN C m1:word, C m2:word, C m3:word, C m4:word, C n1:word, C n2:word, C n3:word, C n4:word\r
index cff63a8fb753944dbf27bea11be3c8a9ae1a63d1..9ffd574369c1561ed2a65298d55a97563c40fb19 100755 (executable)
Binary files a/asmyt.err and b/asmyt.err differ
similarity index 100%
rename from asmyt.o
rename to asmyt.obj
index 8d17537cbeb03ba6feafb73f8026d898954c2888..fa737eca2e9090c9a5b6f214f28193671006e16b 100755 (executable)
--- a/copper.h
+++ b/copper.h
@@ -1,5 +1,5 @@
 #ifndef _COPPER_H_\r
 #define _COPPER_H_\r
-void init_copper();\r
-void close_copper();\r
+int init_copper();\r
+int close_copper();\r
 #endif\r
index 65d6c467f0d5a830e17604a7ca31a8dc40fcb415..d315cdbee972b7b7e2e7ae5bf4ac068760acd309 100755 (executable)
Binary files a/copper.o and b/copper.o differ
diff --git a/copper.obj b/copper.obj
new file mode 100755 (executable)
index 0000000..65d6c46
Binary files /dev/null and b/copper.obj differ
index bb73d883b9e748201e37748000f2fa093dc49fd1..e3918427f3f4bdcd40838f9bef95c8067092d3a9 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -51,7 +51,7 @@ TARGET_OS = dos
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)\r
 \r
-AFLAGS=-mh -0 -d1\r
+AFLAGS=-mh -0 -d1 -e=65536\r
 PLZFLAGS=-fh=plzpart.hed\r
 SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768\r
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)\r
@@ -65,13 +65,13 @@ EXEC = plzpart.exe
 \r
 all: $(EXEC)\r
 \r
-# asmyt.$(OBJ)\r
+#copper.$(OBJ) tweak.$(OBJ) asmyt.$(OBJ)\r
 \r
 #\r
 #game and bakapi executables\r
 #\r
-plzpart.exe: plzpart.$(OBJ) plz.lib plz.$(OBJ)\r
-       wcl $(FLAGS) $(PLZFLAGS) plzpart.$(OBJ) plz.lib plz.$(OBJ) -fm=plzpart.map\r
+plzpart.exe: plzpart.$(OBJ) copper.$(OBJ) tweak.$(OBJ) asmyt.$(OBJ) plz.$(OBJ)\r
+       wcl $(FLAGS) $(PLZFLAGS) plzpart.$(OBJ) copper.$(OBJ) tweak.$(OBJ) asmyt.$(OBJ) plz.$(OBJ) -fm=plzpart.map\r
 \r
 \r
 #\r
@@ -83,20 +83,20 @@ plzpart.$(OBJ): plzpart.h plzpart.c
 #\r
 #non executable objects libraries\r
 #\r
-plz.$(OBJ): plz.h plz.c plz.lib\r
-       wcl $(FLAGS) -c plz.c plz.lib\r
+plz.$(OBJ): plz.h plz.c\r
+       wcl $(FLAGS) -c plz.c\r
 #tasm compiled...\r
-copper.$(OBJ): copper.h copper.asm\r
-#      wcl $(AFLAGS) -zcm=tasm -c copper.asm\r
-tweak.$(OBJ): tweak.h tweak.asm\r
-#      wcl $(AFLAGS) -zcm=tasm -c tweak.asm\r
-asmyt.$(OBJ): asmyt.h asmyt.asm\r
-#      wcl $(AFLAGS) -zcm=tasm -c asmyt.asm\r
+copper.$(OBJ): copper.h copper.asm\r
+       wcl $(AFLAGS) -zcm=tasm -c copper.asm\r
+tweak.$(OBJ): tweak.h tweak.asm\r
+       wcl $(AFLAGS) -zcm=tasm -c tweak.asm\r
+asmyt.$(OBJ): asmyt.h asmyt.asm\r
+       wcl $(AFLAGS) -zcm=tasm -c asmyt.asm\r
 \r
 #\r
 #other~\r
 #\r
 clean: .symbolic\r
        @$(REMOVECOMMAND) $(EXEC)\r
-       @$(REMOVECOMMAND) plz.$(OBJ)\r
-       @$(REMOVECOMMAND) plzpart.$(OBJ)\r
+#      @$(REMOVECOMMAND) *.$(OBJ)\r
+       @$(REMOVECOMMAND) *.o\r
diff --git a/plz.h b/plz.h
index 488fb79ab021acaa61d53e310fc8be798dc91ecc..8f6c9832078438662dfe7098ed8f9b3652d27d59 100755 (executable)
--- a/plz.h
+++ b/plz.h
@@ -7,8 +7,7 @@
 extern setplzparas();\r
 extern int plzline();\r
 extern void tw_opengraph2();\r
-extern set_plzstart();\r
-extern init_copper();\r
+extern int set_plzstart();\r
 extern void tw_setrgbpalette();\r
 \r
 void init_plz();\r
diff --git a/plz.o b/plz.o
deleted file mode 100755 (executable)
index 1481016..0000000
Binary files a/plz.o and /dev/null differ
index df46ac1e3f6cf46dc43165a47cf91c63a68be36d..469de1099b31e7f779d88960a0a5302682a8890e 100755 (executable)
@@ -1,7 +1,7 @@
-Open Watcom Linker Version 2.0 beta Jan 16 2016 17:32:38 (64-bit)
-Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
+Open Watcom Linker Version 2.0 beta Jan 20 2016 10:21:07 (32-bit)
+Copyright (c) 2002-2016 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       16/02/13 14:42:00
+Created on:       16/02/13 19:16:31
 Executable Image: plzpart.exe
 creating a DOS executable
 Error! E2028: init_copper_ is an undefined reference
@@ -32,10 +32,10 @@ Segment                Class          Group          Address         Size
 =======                =====          =====          =======         ====
 
 plzpart_TEXT           CODE           AUTO           0000:0000       00000020
-plz_TEXT               CODE           AUTO           0000:0020       00000a04
-_TEXT                  CODE           AUTO           0000:0a24       000004c8
-COPPER_TEXT            CODE           AUTO           0000:0eec       0000098a
-FAR_DATA               FAR_DATA       AUTO           0187:0006       00000000
+plz_TEXT               CODE           AUTO           0000:0020       00000a0a
+_TEXT                  CODE           AUTO           0000:0a2a       000004c8
+COPPER_TEXT            CODE           AUTO           0000:0ef2       0000098a
+FAR_DATA               FAR_DATA       AUTO           0187:000c       00000000
 _NULL                  BEGDATA        DGROUP         0188:0000       00000020
 _AFTERNULL             BEGDATA        DGROUP         018a:0000       00000002
 CONST                  DATA           DGROUP         018a:0002       00000000
@@ -91,46 +91,46 @@ Module: plz.o(/dos/z/plz/plz.c)
 0188:015a+     _inittable
 0188:0240+     _pals
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm)
-0000:0a29      __STK
-0000:0a49*     __STKOVERFLOW_
+0000:0a2f      __STK
+0000:0a4f*     __STKOVERFLOW_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart)
 0188:0000*     __nullarea
 0188:01fc*     __ovlflag
 0188:01fd*     __intno
 0188:01fe*     __ovlvec
-0000:0a66      _cstart_
-0000:0b39*     _Not_Enough_Memory_
-0000:0c6b      __exit_
-0000:0c8a      __do_exit_with_msg__
-0000:0ce7      __GETDS
+0000:0a6c      _cstart_
+0000:0b3f*     _Not_Enough_Memory_
+0000:0c71      __exit_
+0000:0c90      __do_exit_with_msg__
+0000:0ced      __GETDS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm)
-0000:0cf2      _big_code_
-0000:0cf2*     CodeModelMismatch
+0000:0cf8      _big_code_
+0000:0cf8*     CodeModelMismatch
 Module: plz.lib(COPPER)
-0000:0eec      _frame_count
-0000:0f27*     _init_copper
-0000:0efc*     _close_copper
-0000:0eee      _cop_drop
-0000:0ef0*     _cop_pal
-0000:0ef4*     _do_pal
-0000:0ef8*     _cop_scrl
-0000:0ef6      _cop_start
-0000:0efa*     _cop_plz
-0000:0fb9*     _pompota
-0000:0fe7*     _moveplz
-0000:10c8      _fadepal
-0000:16c8      _cop_fadepal
+0000:0ef2      _frame_count
+0000:0f2d*     _init_copper
+0000:0f02*     _close_copper
+0000:0ef4      _cop_drop
+0000:0ef6*     _cop_pal
+0000:0efa*     _do_pal
+0000:0efe*     _cop_scrl
+0000:0efc      _cop_start
+0000:0f00*     _cop_plz
+0000:0fbf*     _pompota
+0000:0fed*     _moveplz
+0000:10ce      _fadepal
+0000:16ce      _cop_fadepal
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(i4m.asm)
-0000:0cf2      __I4M
-0000:0cf2*     __U4M
+0000:0cf8      __I4M
+0000:0cf8*     __U4M
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm)
-0000:0d11      __PIA
-0000:0d0a*     __PIS
+0000:0d17      __PIA
+0000:0d10*     __PIS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(kbhit.c)
-0000:0d28      kbhit_
+0000:0d2e      kbhit_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c)
-0000:0d3f*     __exit_with_msg_
-0000:0d44      __fatal_runtime_error_
+0000:0d45*     __exit_with_msg_
+0000:0d4a      __fatal_runtime_error_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata)
 0188:0202      __curbrk
 0188:020a      __STACKLOW
@@ -150,18 +150,18 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata)
 0188:0208      __osmode
 0188:0209      __HShift
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmain086.c)
-0000:0d62      __CMain
+0000:0d68      __CMain
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c)
-0000:0dc8      __InitRtns
-0000:0dc8*     __FInitRtns
-0000:0e23      __FiniRtns
-0000:0e23*     __FFiniRtns
+0000:0dce      __InitRtns
+0000:0dce*     __FInitRtns
+0000:0e29      __FiniRtns
+0000:0e29*     __FFiniRtns
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c)
 0188:022c      ___uselfn
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg)
-0000:0e88      __DOSseg__
+0000:0e8e      __DOSseg__
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c)
-0000:0e89      __EnterWVIDEO_
+0000:0e8f      __EnterWVIDEO_
 0188:022e+     ___WD_Present
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c)
 0188:2640      ____Argv
@@ -169,10 +169,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c)
 0188:0230      __amblksiz
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c)
-0000:0ead+     _null_exit_rtn_
-0000:0ead+     __null_int23_exit_
-0000:0eae      exit_
-0000:0ecf+     _exit_
+0000:0eb3+     _null_exit_rtn_
+0000:0eb3+     __null_int23_exit_
+0000:0eb4      exit_
+0000:0ed5+     _exit_
 0188:0232+     ___int23_exit
 0188:0236+     ___FPE_handler_exit
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086)
index 3d9c5ce24d9fbe2907f5d0ee42d31c0b676d9de5..7e82377d9751d8e4b7b075339e7982988d8f7950 100755 (executable)
Binary files a/plzpart.o and b/plzpart.o differ
index b7be5a7c7495e63a44fcd9cebd32b85eb1d43583..995556f05c57665e9b1f03a83dea5c5b3a622bb8 100755 (executable)
--- a/tweak.asm
+++ b/tweak.asm
@@ -1,6 +1,6 @@
                IDEAL\r
                MODEL huge\r
-               p386\r
+.8087\r
 \r
 CODESEG\r
 \r
index adc86f07f0a2ab1c9c2811cb7e253bc9abea4798..46f9c0fd6a2ed78d54054384bd847b2493f1f349 100755 (executable)
--- a/tweak.err
+++ b/tweak.err
@@ -1,9 +1,25 @@
+tweak.asm(3): Error! E019: Unknown directive
+tweak.asm(81): Error! E027: Cannot use 386 register with current CPU setting
+tweak.asm(81): Error! E027: Cannot use 386 register with current CPU setting
+tweak.asm(83): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(116): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(118): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(122): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(150): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(154): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(157): Error! E002: Invalid instruction with current CPU setting
 tweak.asm(174): Error! E065: Operator is expected
+tweak.asm(184): Error! E002: Invalid instruction with current CPU setting
 tweak.asm(186): Error! E065: Operator is expected
 tweak.asm(191): Error! E514: Colon is expected
 tweak.asm(195): Error! E065: Operator is expected
+tweak.asm(208): Error! E002: Invalid instruction with current CPU setting
 tweak.asm(210): Error! E065: Operator is expected
 tweak.asm(245): Error! E065: Operator is expected
+tweak.asm(260): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(274): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(288): Error! E002: Invalid instruction with current CPU setting
+tweak.asm(302): Error! E002: Invalid instruction with current CPU setting
 tweak.asm(308): Error! E065: Operator is expected
 tweak.asm(331): Error! E600: 'C' is already defined
 tweak.asm(333): Error! E611: ARG may only be used within a PROC and before the first instruction
similarity index 100%
rename from tweak.o
rename to tweak.obj