X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=7e80e902f1fe9faccb0fbbbd53ec3ce3eabba7d0;hb=c11666ac6f605f561e9c6c6f2bba3bccea4a7b18;hp=451672803bbb38ae7651f7859727a7b1ddb6f2f4;hpb=243eb728df3bdcce4b677633c0cfcf1068675735;p=16.git diff --git a/makefile b/makefile index 45167280..7e80e902 100755 --- a/makefile +++ b/makefile @@ -4,23 +4,23 @@ # # Possible optimizations for 8088 class processors # -# -oa Relax alias checking -# -ob Try to generate straight line code +# -oa Relax alias checking +# -ob Try to generate straight line code # -oe - expand user functions inline (-oe=20 is default, adds lots of code) -# -oh Enable repeated optimizations -# -oi generate certain lib funcs inline -# -oi+ Set max inline depth (C++ only, use -oi for C) -# -ok Flowing of register save into function flow graph -# -ol loop optimizations -# -ol+ loop optimizations plus unrolling -# -or Reorder for pipelined (486+ procs); not sure if good to use -# -os Favor space over time -# -ot Favor time over space -# -ei Allocate an "int" for all enum types -# -zp2 Allow compiler to add padding to structs -# -zpw Use with above; make sure you are warning free! -# -0 8088/8086 class code generation -# -s disable stack overflow checking +# -oh Enable repeated optimizations +# -oi generate certain lib funcs inline +# -oi +Set max inline depth (C++ only, use -oi for C) +# -ok Flowing of register save into function flow graph +# -ol loop optimizations +# -ol+ loop optimizations plus unrolling +# -or Reorder for pipelined (486+ procs); not sure if good to use +# -os Favor space over time +# -ot Favor time over space +# -ei Allocate an "int" for all enum types +# -zp2 Allow compiler to add padding to structs +# -zpw Use with above; make sure you are warning free! +# -0 8088/8086 class code generation +# -s disable stack overflow checking # -zk0u translate kanji to unicode... wwww # -zk0 kanji support~ @@ -42,6 +42,8 @@ COPYCOMMAND=cp -f DIRSEP=/ OBJ=obj DUMP=cat +DOSLIBMAKE=./make.sh build all dos86h +DOSLIBMAKEALL=./buildall.sh build all dos86h !else #DOS ^^ to_os_path=/=\ REMOVECOMMAND=del @@ -49,6 +51,8 @@ COPYCOMMAND=copy /y DIRSEP=\ OBJ=obj DUMP=type +DOSLIBMAKE=.\make.bat +DOSLIBMAKEALL=.\build.bat !endif TARGET_OS = dos @@ -56,13 +60,13 @@ TARGET_OS = dos BUILD_ROOT=$+$(%__CWD__)$- #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP) DATADIR=data$(DIRSEP) -SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP) +SPRI=$(DATADIR)/spri SRC=src SRCLIB=src/lib JSMNLIB=src/lib/jsmn NYANLIB=src/lib/nyan EXMMLIB=src/lib/exmm -MODEXLIB16=src/lib/modex16 +MODEXLIB16=src/lib/16_vl MODEXLIB=src/lib/modex VGMSNDLIB=src/lib/vgmsnd DOSLIB=src/lib/doslib @@ -78,33 +82,34 @@ DOSLIB_JOYSTICK=src/lib/doslib/hw/joystick # quiet flags # WLIBQ=-q -WCLQ=-zq $(WLIBQ) +WCLQ=-q UPXQ=-qqq # # compile flags # -S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000 +S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -zq -k32768#54096#60000 Z_FLAGS=-zk0 -zc -zp8 -zm O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x -T_FLAGS=-bt=dos -mh -0 -fpi87 +T_FLAGS=-bt=dos -wx -mh -0 -fpi87 -fo=.$(OBJ) -d1###### -e=65536 -CPPFLAGS=-DTARGET_MSDOS=16 +CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 !ifeq DEBUGSERIAL 1 CPPFLAGS += -DDEBUGSERIAL !endif -AFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ) -CFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS) -LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah +AFLAGS=$(WCLQ) $(T_FLAGS) +CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS) +LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah $(S_FLAGS) LIBFLAGS=$(WLIBQ) -b -n # # objects # VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ) -16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ) -GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) -#16planar.$(OBJ) planar.$(OBJ) +OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ) +GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) 16_scr.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS) +16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) +#16planar.$(OBJ) planar.$(OBJ) mapread.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) !ifeq DEBUGSERIAL 1 DOSLIBOBJ += 8250.$(OBJ) @@ -139,6 +144,7 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib .asm.obj: *wcl $(AFLAGS) $(extra_$^&_obj_opts) -c $[@ +#CFLAGS is neccessary here .obj.exe : *wcl $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $< @@ -149,191 +155,192 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib # List of executables to build # TESTEXEC = & - test.exe & - test0.exe & - pcxtest.exe & - pcxtest2.exe & - palettec.exe & - maptest.exe & - fmemtest.exe & - fonttest.exe & - fontgfx.exe & - scroll.exe & - vgmtest.exe & - inputest.exe & - palettel.exe & - exmmtest.exe & - vrstest.exe + tesuto.exe & + 0.exe & + exmmtest.exe & + vgmtest.exe & + scroll.exe & + zcroll.exe & + inputest.exe & + vrstest.exe +TESTEXEC2 = & + maptest.exe & + fmemtest.exe & + fonttest.exe & + fontgfx.exe & + test.exe & + test0.exe & + pcxtest.exe & + pcxtest2.exe +UTILEXEC = & + palettel.exe & + palettec.exe & + db.exe EXEC = & - 16.exe & - bakapi.exe & - tesuto.exe & - 0.exe & - $(TESTEXEC) + 16.exe & + bakapi.exe & + $(UTILEXEC) & + $(TESTEXEC) all: $(EXEC) joytest.exe +testexec: $(EXEC) joytest.exe $(TESTEXEC2) # # game and bakapi executables # -16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) +16.exe: 16.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) +bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) # # Test Executables! # -scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -scroll.$(OBJ): $(SRC)/scroll.c -tesuto.exe: tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS) -tesuto.$(OBJ): $(SRC)/tesuto.c -0.exe: 0.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -0.$(OBJ): $(SRC)/0.c -test.exe: test.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -#test2.exe: test2.$(OBJ) gfx.lib $(DOSLIBLIBS) -test0.exe: test0.$(OBJ) -fonttest.exe: fonttest.$(OBJ) gfx.lib -#fonttes0.exe: fonttes0.$(OBJ) $(16LIB) -fontgfx.exe: fontgfx.$(OBJ) gfx.lib $(DOSLIBLIBS) -inputest.exe: inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS) -#sountest.exe: sountest.$(OBJ) $(16LIB) -pcxtest.exe: pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS) -vrstest.exe: vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -palettec.exe: palettec.$(OBJ) gfx.lib $(DOSLIBLIBS) -palettel.exe: palettel.$(OBJ) gfx.lib $(DOSLIBLIBS) -pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS) -#planrpcx.exe: planrpcx.$(OBJ) gfx.lib -maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) gfx.lib $(DOSLIBLIBS) -fmemtest.exe: fmemtest.$(OBJ) -exmmtest.exe: exmmtest.$(OBJ) $(16LIB) $(DOSLIBLIBS) -vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIBLIBS) +scroll.exe: scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) +scroll.$(OBJ): $(SRC)/scroll.c +zcroll.exe: zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) +zcroll.$(OBJ): $(SRC)/zcroll.c +tesuto.exe: tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS) +tesuto.$(OBJ): $(SRC)/tesuto.c +0.exe: 0.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) +0.$(OBJ): $(SRC)/0.c +test.exe: test.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) +#test2.exe: test2.$(OBJ) gfx.lib $(DOSLIBLIBS) +test0.exe: test0.$(OBJ) +fonttest.exe: fonttest.$(OBJ) gfx.lib +#fonttes0.exe: fonttes0.$(OBJ) $(16LIB) +fontgfx.exe: fontgfx.$(OBJ) gfx.lib $(DOSLIBLIBS) +inputest.exe: inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS) +#sountest.exe: sountest.$(OBJ) $(16LIB) +pcxtest.exe: pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS) +vrstest.exe: vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) +#vgacamm.exe: vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) +palettec.exe: palettec.$(OBJ) gfx.lib $(DOSLIBLIBS) +palettel.exe: palettel.$(OBJ) gfx.lib $(DOSLIBLIBS) +pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS) +#planrpcx.exe: planrpcx.$(OBJ) gfx.lib +maptest.exe: maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS) +fmemtest.exe: fmemtest.$(OBJ) +exmmtest.exe: exmmtest.$(OBJ) $(16LIB) $(DOSLIBLIBS) +vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIBLIBS) +db.exe: db.$(OBJ) # # executable's objects # -16.$(OBJ): $(SRC)/16.c $(SRC)/16.h -bakapi.$(OBJ): $(SRC)/bakapi.c $(SRC)/bakapi.h -test.$(OBJ): $(SRC)/test.c $(SRCLIB)/modex16.h -#test2.$(OBJ): $(SRC)/test2.c $(SRCLIB)/modex16.h -test0.$(OBJ): $(SRC)/test0.c -pcxtest.$(OBJ): $(SRC)/pcxtest.c $(SRCLIB)/modex16.h -vrstest.$(OBJ): $(SRC)/vrstest.c $(SRCLIB)/modex16.h -#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/modex16.h -pcxtest2.$(OBJ): $(SRC)/pcxtest2.c $(SRCLIB)/modex16.h -palettec.$(OBJ): $(SRC)/palettec.c -palettel.$(OBJ): $(SRC)/palettel.c -maptest.$(OBJ): $(SRC)/maptest.c $(SRCLIB)/modex16.h -#emmtest.$(OBJ): $(SRC)/emmtest.c -#emsdump.$(OBJ): $(SRC)/emsdump.c -fmemtest.$(OBJ): $(SRC)/fmemtest.c -fonttest.$(OBJ): $(SRC)/fonttest.c +16.$(OBJ): $(SRC)/16.c $(SRC)/16.h +bakapi.$(OBJ): $(SRC)/bakapi.c $(SRC)/bakapi.h +test.$(OBJ): $(SRC)/test.c $(SRCLIB)/16_vl.h +#test2.$(OBJ): $(SRC)/test2.c $(SRCLIB)/16_vl.h +test0.$(OBJ): $(SRC)/test0.c +pcxtest.$(OBJ):$(SRC)/pcxtest.c $(SRCLIB)/16_vl.h +vrstest.$(OBJ):$(SRC)/vrstest.c $(SRCLIB)/16_vl.h +#vgacamm.$(OBJ):$(SRC)/vgacamm.c $(SRCLIB)/16_vl.h +#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/16_vl.h +pcxtest2.$(OBJ):$(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h +palettec.$(OBJ):$(SRC)/palettec.c +palettel.$(OBJ):$(SRC)/palettel.c +maptest.$(OBJ):$(SRC)/maptest.c $(SRCLIB)/16_vl.h +#emmtest.$(OBJ):$(SRC)/emmtest.c +#emsdump.$(OBJ):$(SRC)/emsdump.c +fmemtest.$(OBJ):$(SRC)/fmemtest.c +fonttest.$(OBJ):$(SRC)/fonttest.c #fonttes0.$(OBJ): $(SRC)/fonttes0.c -fontgfx.$(OBJ): $(SRC)/fontgfx.c -inputest.$(OBJ): $(SRC)/inputest.c +fontgfx.$(OBJ):$(SRC)/fontgfx.c +inputest.$(OBJ):$(SRC)/inputest.c #sountest.$(OBJ): $(SRC)/sountest.c #miditest.$(OBJ): $(SRC)/miditest.c -#testemm.$(OBJ): $(SRC)/testemm.c +#testemm.$(OBJ):$(SRC)/testemm.c #testemm0.$(OBJ): $(SRC)/testemm0.c #tsthimem.$(OBJ): $(SRC)/tsthimem.c -exmmtest.$(OBJ): $(SRC)/exmmtest.c -vgmtest.$(OBJ): $(SRC)/vgmtest.c +exmmtest.$(OBJ):$(SRC)/exmmtest.c +vgmtest.$(OBJ):$(SRC)/vgmtest.c +db.$(OBJ):$(SRC)/db.c # # non executable objects libraries # - 16.lib: $(16LIBOBJS) vgmsnd.lib: $(VGMSNDOBJ) gfx.lib: $(GFXLIBOBJS) *wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $< -# extdep: -# !include $(DOSLIBDIR)$(DIRSEP)extdep.mak - +# +# doslib +# # library deps 16-bit huge $(DOSLIB_CPU)/dos86h/cpu.lib: - cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_DOS)/dos86h/dos.lib: - cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_DOS:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_VGA)/dos86h/vgatty.lib: - cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_VGA)/dos86h/vga.lib: - cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) $(DOSLIB_8250)/dos86h/8250.lib: - cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_8250:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) joytest.exe: - cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT) + cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) && cd $(BUILD_ROOT) $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)dos86h$(DIRSEP)test.exe joytest.exe -#$(DOSLIBLIBS): .symbolic -# @cd $(DOSLIB:$(to_os_path)) -# @.$(DIRSEP)buildall.sh -# @cd $(BUILD_ROOT) - -modex16.$(OBJ): $(SRCLIB)/modex16.c $(SRCLIB)/modex16.h -bakapee.$(OBJ): $(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h -16render.$(OBJ): $(SRCLIB)/16render.c $(SRCLIB)/16render.h -16planar.$(OBJ): $(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h -16_vrs.$(OBJ): $(SRCLIB)/16_vrs.c $(SRCLIB)/16_vrs.h $(DOSLIBLIBS) -16_sprit.$(OBJ): $(SRCLIB)/16_sprit.c $(SRCLIB)/16_sprit.h -bitmap.$(OBJ): $(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h -planar.$(OBJ): $(SRCLIB)/planar.c $(SRCLIB)/planar.h -scroll16.$(OBJ): $(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h -16text.$(OBJ): $(SRCLIB)/16text.c -mapread.$(OBJ): $(SRCLIB)/mapread.c $(SRCLIB)/mapread.h -16_timer.$(OBJ): $(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h -16_in.$(OBJ): $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h -16_mm.$(OBJ): $(SRCLIB)/16_mm.c $(SRCLIB)/16_mm.h -16_ca.$(OBJ): $(SRCLIB)/16_ca.c $(SRCLIB)/16_ca.h -16_dbg.$(OBJ): $(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h -midi.$(OBJ): $(SRCLIB)/midi.c $(SRCLIB)/midi.h -16_head.$(OBJ): $(SRCLIB)/16_head.c $(SRCLIB)/16_head.h -16_hc.$(OBJ): $(SRCLIB)/16_hc.c $(SRCLIB)/16_hc.h -16_snd.$(OBJ): $(SRCLIB)/16_snd.c $(SRCLIB)/16_snd.h -jsmn.$(OBJ): $(JSMNLIB)/jsmn.c $(JSMNLIB)/jsmn.h -kitten.$(OBJ): $(NYANLIB)/kitten.c $(NYANLIB)/kitten.h -vgmSnd.$(OBJ): $(VGMSNDLIB)/vgmSnd.c $(VGMSNDLIB)/vgmSnd.h -wcpu.$(OBJ): $(WCPULIB)/wcpu.c $(WCPULIB)/wcpu.h -#memory.$(OBJ): $(EXMMLIB)/memory.c $(EXMMLIB)/memory.h -c_utils.$(OBJ): $(MODEXLIB)/c_utils.asm -modex.$(OBJ): $(MODEXLIB)/modex.asm + +16_vl.$(OBJ):$(SRCLIB)/16_vl.c $(SRCLIB)/16_vl.h +bakapee.$(OBJ):$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h +16render.$(OBJ):$(SRCLIB)/16render.c $(SRCLIB)/16render.h +16planar.$(OBJ):$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h +16_vrs.$(OBJ): $(SRCLIB)/16_vrs.c $(SRCLIB)/16_vrs.h $(DOSLIBLIBS) +16_sprit.$(OBJ):$(SRCLIB)/16_sprit.c $(SRCLIB)/16_sprit.h +bitmap.$(OBJ): $(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h +planar.$(OBJ): $(SRCLIB)/planar.c $(SRCLIB)/planar.h +16_scr.$(OBJ):$(SRCLIB)/16_scr.c $(SRCLIB)/16_scr.h +16text.$(OBJ): $(SRCLIB)/16text.c +mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h +16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h +16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h +16_in.$(OBJ): $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h +16_mm.$(OBJ): $(SRCLIB)/16_mm.c $(SRCLIB)/16_mm.h +16_pm.$(OBJ): $(SRCLIB)/16_pm.c $(SRCLIB)/16_pm.h +16_ca.$(OBJ): $(SRCLIB)/16_ca.c $(SRCLIB)/16_ca.h +16_dbg.$(OBJ): $(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h +midi.$(OBJ): $(SRCLIB)/midi.c $(SRCLIB)/midi.h +16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h +16_tail.$(OBJ):$(SRCLIB)/16_tail.c $(SRCLIB)/16_tail.h +16_hc.$(OBJ): $(SRCLIB)/16_hc.c $(SRCLIB)/16_hc.h +16_snd.$(OBJ): $(SRCLIB)/16_snd.c $(SRCLIB)/16_snd.h +jsmn.$(OBJ): $(JSMNLIB)/jsmn.c $(JSMNLIB)/jsmn.h +kitten.$(OBJ): $(NYANLIB)/kitten.c $(NYANLIB)/kitten.h +vgmSnd.$(OBJ): $(VGMSNDLIB)/vgmSnd.c $(VGMSNDLIB)/vgmSnd.h +wcpu.$(OBJ): $(WCPULIB)/wcpu.c $(WCPULIB)/wcpu.h +#memory.$(OBJ):$(EXMMLIB)/memory.c $(EXMMLIB)/memory.h +c_utils.$(OBJ):$(MODEXLIB)/c_utils.asm +modex.$(OBJ): $(MODEXLIB)/modex.asm # #other~ # clean: .symbolic - @$(REMOVECOMMAND) $(EXEC) - @$(REMOVECOMMAND) *.$(OBJ) + @if not exist $(DOSLIB)/buildall.sh wmake -h initlibs + @for %f in ($(EXEC)) do @if exist %f $(REMOVECOMMAND) %f !ifdef __LINUX__ @rm *.LIB + @. src/util/bcexmm.sh @rm *.EXE - #@$(REMOVECOMMAND) *.\$\$\$ -!else - @*$(REMOVECOMMAND) *.$$$ !endif - @$(REMOVECOMMAND) 16.lib - @$(REMOVECOMMAND) gfx.lib - @$(REMOVECOMMAND) vgmsnd.lib - @*wlib -n $(WLIBQ) 16.lib - @*wlib -n $(WLIBQ) gfx.lib - @*wlib -n $(WLIBQ) vgmsnd.lib - @$(REMOVECOMMAND) *.16W - @$(REMOVECOMMAND) *.16B - @$(REMOVECOMMAND) *.OBJ - @$(REMOVECOMMAND) *.o - @$(REMOVECOMMAND) *.BCO - #@$(REMOVECOMMAND) makefi~1 - #@$(REMOVECOMMAND) makefile~ - @$(REMOVECOMMAND) __wcl__.LNK -# @$(REMOVECOMMAND) *.smp - @$(REMOVECOMMAND) *.SMP - @$(REMOVECOMMAND) *.hed - @$(REMOVECOMMAND) *.MAH - @$(REMOVECOMMAND) *.mah - @$(REMOVECOMMAND) *.err - #@cd $(DOSLIB:$(to_os_path)) - #@./buildall.sh clean - #@cd $(BUILD_ROOT) + @if exist *.obj $(REMOVECOMMAND) *.obj + @if exist *.OBJ $(REMOVECOMMAND) *.OBJ + @if exist *.bco $(REMOVECOMMAND) *.bco + @if exist *.BCO $(REMOVECOMMAND) *.BCO + @if exist *.LIB $(REMOVECOMMAND) *.LIB + @if exist *.lnk $(REMOVECOMMAND) *.lnk + @if exist *.LNK $(REMOVECOMMAND) *.LNK + @if exist *.smp $(REMOVECOMMAND) *.smp + @if exist *.SMP $(REMOVECOMMAND) *.SMP + @if exist *.hed $(REMOVECOMMAND) *.hed + @if exist *.mah $(REMOVECOMMAND) *.mah + @if exist *.MAH $(REMOVECOMMAND) *.MAH + @if exist *.err $(REMOVECOMMAND) *.err +# @if exist *.16W $(REMOVECOMMAND) *.16W +# @if exist *.16B $(REMOVECOMMAND) *.16B + # @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC) # @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB) # @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB) @@ -341,8 +348,12 @@ clean: .symbolic # @$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB) # @$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB) # @$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB) -# @echo $(watcom) -# @echo $(INCLUDE) + +nuke: .symbolic + @wmake clean + @wmake cldl + @wmake all + @wmake comp backupconfig: .symbolic @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig @@ -357,9 +368,9 @@ comq: .symbolic www: .symbolic @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe*' - #@rm -f /var/www/$(EXEC)* - @rm -f /var/www/*.exe.zip* - #@cp ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP) + #@$(REMOVECOMMAND) -f /var/www/$(EXEC)* + @$(REMOVECOMMAND) -f /var/www/*.exe.zip* + #@$(COPYCOMMAND) ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP) @./src/util/z.sh $(EXEC) $(EXEC) @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/ @scp -r -P 26 x4get.bat 4ch.mooo.com:/var/www/16/ @@ -369,7 +380,7 @@ getwww: .symbolic *x4get.bat $(EXEC) vomitchan: .symbolic - @$(DUMP) *.err + @if exist *.err $(DUMP) *.err ## ## External library management~ ^^ @@ -377,7 +388,12 @@ vomitchan: .symbolic #git submodule add mkdl: .symbolic @cd $(DOSLIB:$(to_os_path)) - @./buildall.sh + @$(DOSLIBMAKEALL) + @cd $(BUILD_ROOT) + +cldl: .symbolic + @cd $(DOSLIB:$(to_os_path)) + @$(DOSLIBMAKEALL) clean @cd $(BUILD_ROOT) uplibs: .symbolic @@ -389,17 +405,18 @@ uplibs: .symbolic @cd $(BUILD_ROOT) reinitlibs: .symbolic - @rm -rf $(SRCLIB)doslib - @rm -rf $(SRCLIB)jsmn - @rm -rf 16/CatacombApocalypse - @rm -rf 16/wolf3d - @rm -rf 16/keen + @$(REMOVECOMMAND) -rf $(DOSLIB) + @$(REMOVECOMMAND) -rf $(JSMNLIB) + @$(REMOVECOMMAND) -rf 16/CatacombApocalypse + @$(REMOVECOMMAND) -rf 16/wolf3d + @$(REMOVECOMMAND) -rf 16/keen + @$(REMOVECOMMAND) -rf 16/Catacomb3D @wmake -h initlibs initlibs: .symbolic - @cp git_con.fig .git/config - @cp git_modu.les .gitmodules - @cp git_igno.re .gitignore + @$(COPYCOMMAND) git_con.fig .git/config + @$(COPYCOMMAND) git_modu.les .gitmodules + @$(COPYCOMMAND) git_igno.re .gitignore @cd $(SRCLIB:$(to_os_path)) @git clone https://github.com/joncampbell123/doslib.git @git clone https://github.com/zserge/jsmn.git @@ -408,8 +425,9 @@ initlibs: .symbolic @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git @git clone https://github.com/id-Software/wolf3d.git @git clone https://github.com/keendreams/keen.git + @git clone https://github.com/FlatRockSoft/Catacomb3D.git @cd $(BUILD_ROOT) - @cp $(DOSLIB)/make-lowercase . + @$(COPYCOMMAND) $(DOSLIB)/make-lowercase . ## ## experimental libs