X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=ff593e97192a54bc61613104e26d8ce4e1c710e2;hb=1b00b653e5ec0033f361a98043e5eb0d1ce16011;hp=2d65a108fa48691e71e1e9195c3a095f560e9bf2;hpb=8b0bb4c958df11e844f73c6fc41de3e7d8bbbbe3;p=16.git

diff --git a/makefile b/makefile
old mode 100644
new mode 100755
index 2d65a108..ff593e97
--- a/makefile
+++ b/makefile
@@ -1,62 +1,118 @@
 !ifdef __LINUX__
-REMOVECOMMAND=rm
+REMOVECOMMAND=rm -f
+COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=o
 !else
-REMOVECOMMAND=del 
+REMOVECOMMAND=del
+COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 !endif
+!ifndef INCLUDE
+IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h
+IFLAGS=-i=$(IN)
+!endif
+
 TARGET_OS = dos
 #-zk0u = translate kanji to unicode... wwww
 #-zk0 = kanji support~
 #-zkl = current codepage
 
-#MFLAGS=-mc# -zm
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
-OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
+#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
-EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+NYANLIB=$(SRCLIB)nyan$(DIRSEP)
+#EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
+DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
+16FLAGS=-fh=16.hed
+BAKAPIFLAGS=-fh=bakapi.hed
+SFLAGS=-sg -st -of+ -k32768 -zu -zdf -zff -zgf#49152#24576
+DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
+ZFLAGS=-zk0 -zq -zc -zp8# -zm
+CFLAGS=$(IFLAGS) -mc -lr -l=dos -wo -x# -d2##wwww
+OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
+FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
+
+DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
+VGMSNDOBJ = 16_snd.$(OBJ) vgmSnd.$(OBJ)
+DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
+16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ)
+#3812intf.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
+TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe tsthimem.exe inputest.exe scroll.exe vgmtest.exe
+#testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
+EXEC = 16.exe bakapi.exe $(TESTEXEC)
+
+all: $(EXEC)
 
 #
-#executables
+#game and bakapi executables
 #
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
-	wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=16.map
 
-scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
-	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
+bakapi.exe: bakapi.$(OBJ) 16.lib
+	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) 16.lib -fm=bakapi.map
+#
+#Test Executables!
+#
+scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
+	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) -fm=scroll.map
 scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
-test.exe: test.$(OBJ) 16.lib
-	wcl $(FLAGS) test.$(OBJ) 16.lib
 
-test2.exe: test2.$(OBJ) 16.lib
-	wcl $(FLAGS) test2.$(OBJ) 16.lib
+#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
+	wcl $(FLAGS) test.$(OBJ) gfx.lib -fm=test.map
+
+test2.exe: test2.$(OBJ) gfx.lib
+	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map
 
 fonttest.exe: fonttest.$(OBJ) 16.lib
-	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
+	wcl $(FLAGS) fonttest.$(OBJ) 16.lib# -fm=fonttest.map
+
+#fonttes0.exe: fonttes0.$(OBJ) 16.lib
+#	wcl $(FLAGS) fonttes0.$(OBJ) 16.lib
+
+fontgfx.exe: fontgfx.$(OBJ) 16.lib
+	wcl $(FLAGS) fontgfx.$(OBJ) 16.lib -fm=fontgfx.map
 
 inputest.exe: inputest.$(OBJ) 16.lib
-	wcl $(FLAGS) inputest.$(OBJ) 16.lib
+	wcl $(FLAGS) -D__DEBUG_InputMgr__=1 inputest.$(OBJ) 16.lib -fm=inputest.map
+
+#sountest.exe: sountest.$(OBJ) 16.lib
+#	wcl $(FLAGS) sountest.$(OBJ) 16.lib
+
+#miditest.exe: miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
+#	wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
 
-pcxtest.exe: pcxtest.$(OBJ) 16.lib
-	wcl $(FLAGS) pcxtest.$(OBJ) 16.lib
+tsthimem.exe: tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) -fm=tsthimem.map
 
-palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
-	wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
+#testemm.exe: testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#	wcl $(FLAGS) testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+
+#testemm0.exe: testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+#	wcl $(FLAGS) testemm0.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+
+pcxtest.exe: pcxtest.$(OBJ) gfx.lib
+	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map
+
+palettec.exe: palettec.$(OBJ) 16.lib
+	wcl $(FLAGS) palettec.$(OBJ) 16.lib -fm=palettec.map
 
 maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
-	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=maptest.map
 
 #maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
 #	wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
@@ -67,11 +123,16 @@ maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 #emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
 #	wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
 
-fmemtest.exe: fmemtest.$(OBJ)
-	wcl $(FLAGS) fmemtest.$(OBJ)
+fmemtest.exe: fmemtest.$(OBJ) 16.lib
+	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib -fm=fmemtest.map
+
+exmmtest.exe: exmmtest.$(OBJ) 16.lib
+	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map
+
+vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib 16.lib
+	wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map 16.lib
+	#====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map
 
-exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
-        wcl $(FLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)
 
 #
 #executable's objects
@@ -79,6 +140,9 @@ exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
 16.$(OBJ): $(SRC)16.h $(SRC)16.c
 	wcl $(FLAGS) -c $(SRC)16.c
 
+bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c
+	wcl $(FLAGS) -c $(SRC)bakapi.c
+
 test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test.c
 
@@ -107,28 +171,59 @@ fmemtest.$(OBJ): $(SRC)fmemtest.c
 	wcl $(FLAGS) -c $(SRC)fmemtest.c
 
 fonttest.$(OBJ): $(SRC)fonttest.c
-	wcl -c $(SRC)fonttest.c
+	wcl $(FLAGS) -c $(SRC)fonttest.c
+
+#fonttes0.$(OBJ): $(SRC)fonttes0.c
+#	wcl $(FLAGS) -c $(SRC)fonttes0.c
+
+fontgfx.$(OBJ): $(SRC)fontgfx.c
+	wcl $(FLAGS) -c $(SRC)fontgfx.c
 
 inputest.$(OBJ): $(SRC)inputest.c
 	wcl $(FLAGS) -c $(SRC)inputest.c
 
+#sountest.$(OBJ): $(SRC)sountest.c
+#	wcl $(FLAGS) -c $(SRC)sountest.c
+
+#miditest.$(OBJ): $(SRC)miditest.c
+#	wcl $(FLAGS) -c $(SRC)miditest.c
+
+#testemm.$(OBJ): $(SRC)testemm.c
+#	wcl $(FLAGS) -c $(SRC)testemm.c
+
+#testemm0.$(OBJ): $(SRC)testemm0.c
+#	wcl $(FLAGS) -c $(SRC)testemm0.c
+
+tsthimem.$(OBJ): $(SRC)tsthimem.c
+	wcl $(FLAGS) -c $(SRC)tsthimem.c
+
 exmmtest.$(OBJ): $(SRC)exmmtest.c
 	wcl $(FLAGS) -c $(SRC)exmmtest.c
 
+vgmtest.$(OBJ): $(SRC)vgmtest.c
+	wcl $(FLAGS) -c $(SRC)vgmtest.c
+	#====wcl -mc -c $(SRC)vgmtest.c
+
 #
 #non executable objects libraries
 #
-16.lib: $(16LIBOBJS) gfx.lib
-	wlib -b 16.lib $(16LIBOBJS) gfx.lib
+16.lib: $(16LIBOBJS) gfx.lib doslib.lib vgmsnd.lib
+	wlib -b -q 16.lib $(16LIBOBJS) gfx.lib doslib.lib vgmsnd.lib
 
 gfx.lib: $(GFXLIBOBJS)
-	wlib -b gfx.lib $(GFXLIBOBJS)
+	wlib -b -q gfx.lib $(GFXLIBOBJS)
+
+doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+	wlib -b -q doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib
+
+vgmsnd.lib: $(VGMSNDOBJ)
+	wlib -b -q vgmsnd.lib $(VGMSNDOBJ)
 
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
 
-#dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
-#	wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
+bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c
+	wcl $(FLAGS) -c $(SRCLIB)bakapee.c
 
 bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
@@ -143,26 +238,78 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 
 16text.$(OBJ): $(SRCLIB)16text.c
-	wcl -c $(SRCLIB)16text.c
+	wcl $(FLAGS) -c $(SRCLIB)16text.c
 
-mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
-	wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
+	wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
 #fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
 #	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
 
+timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
+	wcl $(FLAGS) -c $(SRCLIB)timer.c
+
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
 	wcl $(FLAGS) -c $(SRCLIB)16_in.c
 
 16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
 	wcl $(FLAGS) -c $(SRCLIB)16_mm.c
 
-lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
-	wcl $(FLAGS) -c $(SRCLIB)lib_head.c
+16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
+	wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+
+midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c
+	wcl $(FLAGS) -c $(SRCLIB)midi.c
+
+#
+# doslib stuff
+#
+adlib.$(OBJ): $(DOSLIB)adlib.h $(DOSLIB)adlib.c
+	wcl $(FLAGS) -c $(DOSLIB)adlib.c
+
+8254.$(OBJ): $(DOSLIB)8254.h $(DOSLIB)8254.c
+	wcl $(FLAGS) -c $(DOSLIB)8254.c
+
+8259.$(OBJ): $(DOSLIB)8259.h $(DOSLIB)8259.c
+	wcl $(FLAGS) -c $(DOSLIB)8259.c
+
+dos.$(OBJ): $(DOSLIB)dos.h $(DOSLIB)dos.c
+	wcl $(FLAGS) -c $(DOSLIB)dos.c
+
+cpu.$(OBJ): $(DOSLIB)cpu.h $(DOSLIB)cpu.c
+	wcl $(FLAGS) -c $(DOSLIB)cpu.c
+
+himemsys.$(OBJ): $(DOSLIB)himemsys.h $(DOSLIB)himemsys.c
+	wcl $(FLAGS) -c $(DOSLIB)himemsys.c
+
+emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
+	wcl $(FLAGS) -c $(DOSLIB)emm.c
+
+# end of doslib stuff
+
+16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
+	wcl $(FLAGS) -c $(SRCLIB)16_head.c
+
+16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
+	wcl $(FLAGS) -c $(SRCLIB)16_hc.c
+
+16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c
+	wcl $(FLAGS) -c $(SRCLIB)16_snd.c
+	#====wcl -mc -c $(SRCLIB)16_snd.c
 
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
+kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
+	wcl $(FLAGS) -c $(NYANLIB)kitten.c
+
+vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
+	wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
+	#====wcl -c -mc $(VGMSNDLIB)vgmSnd.c
+
+#3812intf.$(OBJ): $(VGMSNDLIB)3812intf.h $(VGMSNDLIB)3812intf.c
+#	wcl $(FLAGS) -c $(VGMSNDLIB)3812intf.c
+
 #farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
 #	wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
 
@@ -173,12 +320,35 @@ jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 #other~
 #
 clean: .symbolic
+	@$(REMOVECOMMAND) $(EXEC)
 	@$(REMOVECOMMAND) *.$(OBJ)
-#	@$(REMOVECOMMAND) *.OBJ
-#	@$(REMOVECOMMAND) *.out
-#	@$(REMOVECOMMAND) *.OUT
+	@$(REMOVECOMMAND) *.lib
+	@wlib -n 16.lib
+	@wlib -n  gfx.lib
+	@wlib -n  doslib.lib
+	@wlib -n  vgmsnd.lib
+	@$(REMOVECOMMAND) *.16
+	@$(REMOVECOMMAND) *.16W
+	@$(REMOVECOMMAND) *.16B
+	@$(REMOVECOMMAND) *.OBJ
+	@$(REMOVECOMMAND) *.o
+	@$(REMOVECOMMAND) *.BCO
 	@$(REMOVECOMMAND) makefi~1
-	@$(REMOVECOMMAND) __WCL__.LNK
+	@$(REMOVECOMMAND) makefile~
+	@$(REMOVECOMMAND) __wcl__.LNK
 #	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
-
+	@$(REMOVECOMMAND) *.hed
+	@$(REMOVECOMMAND) *.MAP
+	@$(REMOVECOMMAND) *.map
+	@$(REMOVECOMMAND) *.err
+	@$(COPYCOMMAND) .git/config git_con.fig
+#	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
+#	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)16_ca.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
+	@echo $(watcom)
+	@echo $(INCLUDE)