From: Jonathan Campbell Date: Mon, 28 Mar 2016 22:33:12 +0000 (-0700) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=4df04665672df77e5f3101db8dda37725a219655;hp=8ae6c7e022c26bad44a6488b8a589ddbe7c8731b;p=16.git Merge remote-tracking branch 'upstream/master' --- diff --git a/dld.bat b/DLD.BAT similarity index 100% rename from dld.bat rename to DLD.BAT diff --git a/DLDV.BAT b/DLDV.BAT new file mode 100755 index 00000000..953defe5 --- /dev/null +++ b/DLDV.BAT @@ -0,0 +1 @@ +cd src\lib\doslib\hw\vga diff --git a/dldv.sh b/dldv.sh new file mode 100755 index 00000000..4f134c84 --- /dev/null +++ b/dldv.sh @@ -0,0 +1 @@ +cd src/lib/doslib/hw/vga diff --git a/makefile b/makefile index cf5e2cbe..c156f741 100755 --- a/makefile +++ b/makefile @@ -40,10 +40,6 @@ COPYCOMMAND=copy /y DIRSEP=\ OBJ=obj !endif -#!ifndef INCLUDE -#IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h -#IFLAGS=-i=$(IN) -#!endif TARGET_OS = dos @@ -77,19 +73,19 @@ FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS) PCX2VRL=$(DOSLIBDIR)/hw/vga/pcx2vrl -DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ) +#DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ) VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(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 +DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.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 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe -EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe drawvrl5.exe +EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe all: $(EXEC) @@ -100,8 +96,9 @@ 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 modex.lib -fm=bakapi.map +bakapi.exe: bakapi.$(OBJ) gfx.lib# modex.lib + wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib -fm=bakapi.map +#modex.lib # #Test Executables! # @@ -114,27 +111,13 @@ scroll.$(OBJ): $(SRC)scroll.c # NOTE: dos86h = 16-bit huge memory model. memory model must match! tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib # %write tmp.cmd option quiet option map=tesuto.map $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe -# %write tmp.cmd library $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib -# %write tmp.cmd library $(DOSLIBDIR)/hw/dos/dos86h/dos.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 wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib tesuto.$(OBJ): $(SRC)tesuto.c wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c -drawvrl5.exe: .symbolic - #@cd $(DOSLIB)hw/vga/make. - @wmake $(DOSLIBDIR)/hw/vga/dos86h/vga.lib - @$(COPYCOMMAND) $(DOSLIBDIR)/hw/vga/dos86h/drawvrl5.exe ./ -#tesuto.exe: tesuto.$(OBJ) -# wcl $(WCLQ) -mh -d2 tesuto.$(OBJ) -#tesuto.$(OBJ): $(SRC)tesuto.c -# wcl $(WCLQ) -mh -d2 -c $(SRC)tesuto.c - -#sega.exe: sega.$(OBJ) -# wcl $(FLAGS) sega.$(OBJ) -#sega.$(OBJ): $(SRC)sega.c -# wcl $(FLAGS) -c $(SRC)sega.c - test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) -fm=test.map @@ -301,18 +284,18 @@ vgmsnd.lib: $(VGMSNDOBJ) wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ) # extdep: -# !include $(DOSLIBDIR)/extdep.mak +# !include $(DOSLIBDIR)$(DIRSEP)extdep.mak # library deps 16-bit huge -$(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib: - cd $(DOSLIBDIR)/hw/cpu && ./make.sh -$(DOSLIBDIR)/hw/dos/dos86h/dos.lib: - cd $(DOSLIBDIR)/hw/dos && ./make.sh -$(DOSLIBDIR)/hw/vga/dos86h/vga.lib: - cd $(DOSLIBDIR)/hw/vga && ./make.sh +$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib: + cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu && .$(DIRSEP)make.sh +$(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 #$(DOSLIBLIBS): .symbolic # @cd $(DOSLIB) -# @./buildall.sh +# @.$(DIRSEP)buildall.sh # @cd $(PDIR)$(PDIR)$(PDIR) modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c @@ -447,8 +430,11 @@ clean: .symbolic @$(REMOVECOMMAND) *.MAP @$(REMOVECOMMAND) *.map @$(REMOVECOMMAND) *.err - @$(COPYCOMMAND) .git/config git_con.fig + @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig @$(COPYCOMMAND) .gitmodules git_modu.les + @cd $(DOSLIB) + #@./buildall.sh clean + @cd $(PDIR)$(PDIR)$(PDIR) # @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC) # @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB) # @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB) @@ -468,7 +454,7 @@ comq: .symbolic www: .symbolic @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe.zip*' @rm "/var/www/$(EXEC).zip*" - #@cp ./$(EXEC) /var/www/ + #@cp ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP) @./z.sh $(EXEC) $(EXEC) @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/ @scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/ @@ -511,18 +497,18 @@ initlibs: .symbolic ## experimental libs ## xlib: .symbolic - @cd 16/xlib + @cd 16$(DIRSEP)xlib @wmake -h clean @wmake -h all @cd $(PDIR)$(PDIR) mx: .symbolic - @cd 16/xw + @cd 16$(DIRSEP)xw # @wmake clean @wmake -h all @cd $(PDIR)$(PDIR) mx_: .symbolic - @cd 16/xw_ + @cd 16$(DIRSEP)xw_ @wmake -h -f makefile all @cd $(PDIR)$(PDIR) diff --git a/src/lib/doslib b/src/lib/doslib index 75139e43..be9c7f3c 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit 75139e439a4023b0fec54c481246c5111dd9f9bd +Subproject commit be9c7f3c9abb00385d07fa9baac9d5ead2f6ce04 diff --git a/src/lib/jsmn b/src/lib/jsmn index 572ace5a..b77d84ba 160000 --- a/src/lib/jsmn +++ b/src/lib/jsmn @@ -1 +1 @@ -Subproject commit 572ace5a43c43b1c6dc55f31fab03718faf2f647 +Subproject commit b77d84ba48e057aa464b6c6b6f6209e632918cb3 diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 55122d14..41634957 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 * * This file is part of Project 16. * @@ -597,8 +597,9 @@ void shinku(map_view_t *pip, global_game_variables_t *gv) word bgcol = 0; word type = 1; //t=(((*(gv->clock))-gv->clock_start) /18.2); - sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv)); - modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1); + //sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv)); + printf("%f fps", (double)gv->kurokku.tiku/ticktock(gv)); + //modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1); //(gv->clock_start)=*(gv->clock); gv->kurokku.tiku=0; } diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index dbfb7930..b39e95b0 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 * * This file is part of Project 16. * diff --git a/src/sega.c b/src/sega.c deleted file mode 100755 index 3a271cd2..00000000 --- a/src/sega.c +++ /dev/null @@ -1,67 +0,0 @@ -#include -#include -#include - -struct list { -#ifdef __WATCOMC__ - struct list __based(__self) *next; -#endif -#ifdef __BORLANDC__ - struct list _seg *next; -#endif - int value; -}; - -void main(int argc, char *argv[]) -{ - int i; -#ifdef __WATCOMC__ - __segment segu; - void __based(__self) *pee; - struct list __based(segu) *head; - struct list __based(segu) *p; -#endif -#ifdef __BORLANDC__ - void _seg *pee; - struct list _seg *head; - struct list _seg *p; -#endif - - /* allocate based heap */ - segu = _bheapseg( 65536 ); - if( segu == _NULLSEG ) { - printf( "Unable to allocate based heap\n" ); - exit( 1 ); - } - - /* create a linked list in the based heap */ - head = 0; - for( i = 1; i < 4096; i++ ) { - p = _bmalloc( segu, sizeof( struct list ) ); - if( p == _NULLOFF ) { - printf( "_bmalloc failed\n" ); - break; - } - p->next = head; - p->value = i; - head = p; - } - - /* traverse the linked list, printing out values */ - for( p = head; p != 0; p = p->next ) { - if(p==head || p->next==0 || p==pee){ - printf("Segu = %04X", p); printf( " Value = %d\n", p->value ); - } - } - - printf("program=%FP\n", *argv[0]); - printf("seg=%04X\n", segu); - - /* free all the elements of the linked list */ - for( ; p = head; ) { - head = p->next; - _bfree( segu, p ); - } - /* free the based heap */ - _bfreeseg( segu ); -} diff --git a/t2.bat b/t2.bat deleted file mode 100755 index 7c034745..00000000 --- a/t2.bat +++ /dev/null @@ -1 +0,0 @@ -drawvrl5.exe data\aconita.vrl data\aconita.pal diff --git a/y.sh b/y.sh deleted file mode 100755 index 40b4278d..00000000 --- a/y.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# run this from the top dir of the project -topdir=`pwd` - -# force rebuild of the project -wmake clean -# force rebuild of doslib, make sure the latest is checked out from master -cd "$topdir/src/lib/doslib" || exit 1 -git pull -git checkout master -git pull -./buildall.sh clean -# back to top dir, build project again -cd "$topdir" || exit 1 -./wbuild.sh