X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=af0fa557811f3eec1400bcff246403e5d9735e6e;hb=d71e4ebbd3770b48eee2b2cc18288b97aad4e1e4;hp=778d1a1072bd40a4e516ff47bcce9ce0fbb4877c;hpb=130910e5b7eed3eee86ce1008ffcbd4916aa382c;p=16.git diff --git a/makefile b/makefile index 778d1a10..af0fa557 100755 --- a/makefile +++ b/makefile @@ -71,6 +71,7 @@ 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) +PCX2VRL=$(DOSLIBDIR)/hw/vga/pcx2vrl #DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ) VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ) @@ -86,7 +87,7 @@ TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe -all: $(EXEC) +all: $(EXEC) joytest.exe #$(16LIBOBJS) => 16.lib bug.... # @@ -95,8 +96,8 @@ all: $(EXEC) 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map -bakapi.exe: bakapi.$(OBJ) gfx.lib# modex.lib - wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib -fm=bakapi.map +bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) + wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.map #modex.lib # #Test Executables! @@ -292,6 +293,8 @@ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib: cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos && .$(DIRSEP)make.sh $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib: cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh +joytest.exe: + cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)joytest.exe #$(DOSLIBLIBS): .symbolic # @cd $(DOSLIB) # @.$(DIRSEP)buildall.sh