From 7fa545fe916f2f0384f6b8412f609c3b6c673b0c Mon Sep 17 00:00:00 2001 From: sparky4 Date: Wed, 27 Jul 2016 08:56:10 -0500 Subject: [PATCH] meh --- __wcl__.lnk | 20 -------------------- makefile | 25 +++++++++++++++++++++---- src/scroll.c | 2 +- temp.cmd | 1 + 4 files changed, 23 insertions(+), 25 deletions(-) delete mode 100755 __wcl__.lnk create mode 100755 temp.cmd diff --git a/__wcl__.lnk b/__wcl__.lnk deleted file mode 100755 index 53286c65..00000000 --- a/__wcl__.lnk +++ /dev/null @@ -1,20 +0,0 @@ -option quiet -debug dwarf lines -option stack=32768 -system dos -file exmmtest.o -file 16_in.o -file 16_mm.o -file wcpu.o -file 16_head.o -file 16_ca.o -file 16_dbg.o -file kitten.o -file 16_hc.o -file 16_timer.o -name exmmtest -option map=exmmtest.mah -library src/lib/doslib/hw/cpu/dos86h/cpu.lib -library src/lib/doslib/hw/dos/dos86h/dos.lib -library src/lib/doslib/hw/vga/dos86h/vga.lib -library src/lib/doslib/hw/8250/dos86h/8250.lib diff --git a/makefile b/makefile index 8d2a0a32..1789098a 100755 --- a/makefile +++ b/makefile @@ -40,11 +40,13 @@ REMOVECOMMAND=rm -f COPYCOMMAND=cp -f DIRSEP=/ OBJ=o +DUMP=cat !else REMOVECOMMAND=del COPYCOMMAND=copy /y DIRSEP=\ OBJ=obj +DUMP=type !endif TARGET_OS = dos @@ -79,8 +81,8 @@ AFLAGS=-mh -0 -d1 SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) ZFLAGS=-zk0 -zc -zp8 -zm $(WCLQ) -LFLAG=-lr -l=dos -fd -CFLAGS=$(AFLAGS) $(IFLAGS) -wo -i$(DOSLIB) $(LFLAG) +LFLAGS=-lr -l=dos +CFLAGS=$(AFLAGS) $(IFLAGS) -wo -i$(DOSLIB) $(LFLAGS) OFLAGS=-obmilr -oe=24 -out -oh -ei -zp8 -fpi87 -onac -ol+ -ok####x FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS) @@ -107,9 +109,11 @@ EXEC = 16.exe bakapi.exe tesuto.exe 0.exe $(TESTEXEC) all: $(EXEC) joytest.exe #16.lib => $(16LIBOBJS) bug.... -16LIB=$(16LIBOBJS) +#16LIB=$(16LIBOBJS) +16LIB=16.lib + !ifeq DEBUGSERIAL 1 -16LIB += $(DOSLIBLIBS) +16LIBOBJS += $(DOSLIBLIBS) !endif # #game and bakapi executables @@ -135,6 +139,16 @@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib # %write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib # %write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib # @wlink @tmp.cmd + +# +# add this ww to reduce junk www +# +# NTS we have to construct the command line into tmp.cmd because for MS-DOS +# systems all arguments would exceed the pitiful 128 char command line limit +#.C.OBJ: +# %write temp.cmd $(CFLAGS_THIS) $(CFLAGS_CON) $[@ +# wcl @temp.cmd +# wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib tesuto.$(OBJ): $(SRC)tesuto.c wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c @@ -456,6 +470,9 @@ www: .symbolic getwww: .symbolic @x4get.bat $(EXEC) +vomitchan: .symbolic + @$(DUMP) *.err + ## ## External library management~ ^^ ## diff --git a/src/scroll.c b/src/scroll.c index 6f70915b..840f0b7d 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -40,7 +40,7 @@ sword bakapee; pan_t pan; //debugswitches boolean panswitch=0; -boolean pageflipflop=1; +extern boolean pageflipflop=1; unsigned int i; const char *cpus; //static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ diff --git a/temp.cmd b/temp.cmd new file mode 100755 index 00000000..b24818d5 --- /dev/null +++ b/temp.cmd @@ -0,0 +1 @@ +-mh -0 -d1 -wo -isrc/lib/doslib/ -obmilr -oe=24 -out -oh -ei -zp8 -fpi87 -onac -ol+ -ok -DTARGET_MSDOS=16 -DMSDOS=1 -sg -st -of+ -zu -zdf -zff -zgf -k32768 -zk0 -zc -zp8 -zm -zq -q -DDEBUGSERIAL 16.o mapread.o jsmn.o 16_in.o 16_mm.o wcpu.o 16_head.o 16_ca.o 16_dbg.o kitten.o 16_hc.o 16_timer.o src/lib/doslib/hw/cpu/dos86h/cpu.lib src/lib/doslib/hw/dos/dos86h/dos.lib src/lib/doslib/hw/vga/dos86h/vga.lib src/lib/doslib/hw/8250/dos86h/8250.lib gfx.lib -fm=16.mah -- 2.11.0