From: sparky4 Date: Sun, 14 Feb 2016 01:19:13 +0000 (-0600) Subject: wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=ea807cd3df022cf108c2365835d07eab6b82a613;p=plz.git wwww --- diff --git a/asmyt.asm b/asmyt.asm index 7bef947..0c1198c 100755 --- a/asmyt.asm +++ b/asmyt.asm @@ -1,6 +1,6 @@ IDEAL MODEL huge - p386 +.8087 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 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 diff --git a/asmyt.err b/asmyt.err index cff63a8..9ffd574 100755 Binary files a/asmyt.err and b/asmyt.err differ diff --git a/asmyt.o b/asmyt.obj similarity index 100% rename from asmyt.o rename to asmyt.obj diff --git a/copper.h b/copper.h index 8d17537..fa737ec 100755 --- a/copper.h +++ b/copper.h @@ -1,5 +1,5 @@ #ifndef _COPPER_H_ #define _COPPER_H_ -void init_copper(); -void close_copper(); +int init_copper(); +int close_copper(); #endif diff --git a/copper.o b/copper.o index 65d6c46..d315cdb 100755 Binary files a/copper.o and b/copper.o differ diff --git a/copper.obj b/copper.obj new file mode 100755 index 0000000..65d6c46 Binary files /dev/null and b/copper.obj differ diff --git a/makefile b/makefile index bb73d88..e391842 100755 --- a/makefile +++ b/makefile @@ -51,7 +51,7 @@ TARGET_OS = dos SRC=src$(DIRSEP) SRCLIB=$(SRC)lib$(DIRSEP) -AFLAGS=-mh -0 -d1 +AFLAGS=-mh -0 -d1 -e=65536 PLZFLAGS=-fh=plzpart.hed SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) @@ -65,13 +65,13 @@ EXEC = plzpart.exe all: $(EXEC) -# asmyt.$(OBJ) +#copper.$(OBJ) tweak.$(OBJ) asmyt.$(OBJ) # #game and bakapi executables # -plzpart.exe: plzpart.$(OBJ) plz.lib plz.$(OBJ) - wcl $(FLAGS) $(PLZFLAGS) plzpart.$(OBJ) plz.lib plz.$(OBJ) -fm=plzpart.map +plzpart.exe: plzpart.$(OBJ) copper.$(OBJ) tweak.$(OBJ) asmyt.$(OBJ) plz.$(OBJ) + wcl $(FLAGS) $(PLZFLAGS) plzpart.$(OBJ) copper.$(OBJ) tweak.$(OBJ) asmyt.$(OBJ) plz.$(OBJ) -fm=plzpart.map # @@ -83,20 +83,20 @@ plzpart.$(OBJ): plzpart.h plzpart.c # #non executable objects libraries # -plz.$(OBJ): plz.h plz.c plz.lib - wcl $(FLAGS) -c plz.c plz.lib +plz.$(OBJ): plz.h plz.c + wcl $(FLAGS) -c plz.c #tasm compiled... -# copper.$(OBJ): copper.h copper.asm -# wcl $(AFLAGS) -zcm=tasm -c copper.asm -# tweak.$(OBJ): tweak.h tweak.asm -# wcl $(AFLAGS) -zcm=tasm -c tweak.asm -# asmyt.$(OBJ): asmyt.h asmyt.asm -# wcl $(AFLAGS) -zcm=tasm -c asmyt.asm +copper.$(OBJ): copper.h copper.asm + wcl $(AFLAGS) -zcm=tasm -c copper.asm +tweak.$(OBJ): tweak.h tweak.asm + wcl $(AFLAGS) -zcm=tasm -c tweak.asm +asmyt.$(OBJ): asmyt.h asmyt.asm + wcl $(AFLAGS) -zcm=tasm -c asmyt.asm # #other~ # clean: .symbolic @$(REMOVECOMMAND) $(EXEC) - @$(REMOVECOMMAND) plz.$(OBJ) - @$(REMOVECOMMAND) plzpart.$(OBJ) +# @$(REMOVECOMMAND) *.$(OBJ) + @$(REMOVECOMMAND) *.o diff --git a/plz.h b/plz.h index 488fb79..8f6c983 100755 --- a/plz.h +++ b/plz.h @@ -7,8 +7,7 @@ extern setplzparas(); extern int plzline(); extern void tw_opengraph2(); -extern set_plzstart(); -extern init_copper(); +extern int set_plzstart(); extern void tw_setrgbpalette(); void init_plz(); diff --git a/plz.o b/plz.o deleted file mode 100755 index 1481016..0000000 Binary files a/plz.o and /dev/null differ diff --git a/plzpart.map b/plzpart.map index df46ac1..469de10 100755 --- a/plzpart.map +++ b/plzpart.map @@ -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) diff --git a/plzpart.o b/plzpart.o index 3d9c5ce..7e82377 100755 Binary files a/plzpart.o and b/plzpart.o differ diff --git a/tweak.asm b/tweak.asm index b7be5a7..995556f 100755 --- a/tweak.asm +++ b/tweak.asm @@ -1,6 +1,6 @@ IDEAL MODEL huge - p386 +.8087 CODESEG diff --git a/tweak.err b/tweak.err index adc86f0..46f9c0f 100755 --- 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 diff --git a/tweak.o b/tweak.obj similarity index 100% rename from tweak.o rename to tweak.obj