From b656b8121cfcada5d9f0528f2806b775edcdfb15 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 21 Mar 2016 10:23:39 -0500 Subject: [PATCH] wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww works now wwwww --- makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/makefile b/makefile index d695bc58..1df56813 100755 --- a/makefile +++ b/makefile @@ -61,8 +61,6 @@ DOSLIB=$(SRCLIB)doslib$(DIRSEP) DOSLIBDIR=$(SRCLIB)doslib WCPULIB=$(SRCLIB)wcpu$(DIRSEP) -include $(DOSLIBDIR)/extdep.mak - WLIBQ=-q WCLQ=-zq $(WLIBQ) UPXQ=-qqq @@ -73,7 +71,7 @@ BAKAPIFLAGS=-fh=bakapi.hed SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm -CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB) ##wwww +CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87 -onac -ol+ -ok####x FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS) @@ -86,7 +84,6 @@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) DOSLIBLIBS=$(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib $(DOSLIBDIR)/hw/dos/dos86h/dos.lib $(DOSLIBDIR)/hw/vga/dos86h/vga.lib -#dl_vga.lib dl_cpu.lib dl_dos.lib TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe # tsthimem.exe @@ -95,8 +92,9 @@ EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe all: $(EXEC) -#$(16LIBOBJS) => 16.lib bug.... +!include $(DOSLIBDIR)/extdep.mak +#$(16LIBOBJS) => 16.lib bug.... # #game and bakapi executables # -- 2.39.5