From: sparky4 Date: Mon, 14 Mar 2016 15:24:04 +0000 (-0500) Subject: cleaning the repo up~ and updating stuff~ X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b632f77697e90088581f3f4ef89442a96a365371;p=16.git cleaning the repo up~ and updating stuff~ --- diff --git a/awoo.sh b/awoo.sh index a059f113..27ad1558 100755 --- a/awoo.sh +++ b/awoo.sh @@ -1,5 +1,5 @@ #!/bin/bash -. ./build.sh +. ./wbuild.sh if [ -f "*.exe" ] then wmake -h www diff --git a/doc/char/chikyuuy.png b/doc/char/chikyuuy.png new file mode 100755 index 00000000..f21c544a Binary files /dev/null and b/doc/char/chikyuuy.png differ diff --git a/makefile b/makefile index cee3055a..7bca89e3 100755 --- a/makefile +++ b/makefile @@ -79,8 +79,7 @@ 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) timer.$(OBJ) -# -#3812intf.$(OBJ) + GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) 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 @@ -90,7 +89,7 @@ EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe all: $(EXEC) -#$(16LIBOBJS) => 16.lib +#$(16LIBOBJS) => 16.lib bug.... # #game and bakapi executables @@ -154,11 +153,11 @@ tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) pcxtest.exe: pcxtest.$(OBJ) gfx.lib wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map -palettec.exe: palettec.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) palettec.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettec.map +palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS) + wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.map #$(16LIBOBJS) -palettel.exe: palettel.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) palettel.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettel.map +palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS) + wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.map #$(16LIBOBJS) pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map diff --git a/build.sh b/wbuild.sh similarity index 100% rename from build.sh rename to wbuild.sh