X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=makefile;h=ff593e97192a54bc61613104e26d8ce4e1c710e2;hb=1b00b653e5ec0033f361a98043e5eb0d1ce16011;hp=59abcd6323f05f8c2ac27cec24b84f20524909a0;hpb=becda0c4ce4965be72051bfb503c910a09029155;p=16.git

diff --git a/makefile b/makefile
index 59abcd63..ff593e97 100755
--- a/makefile
+++ b/makefile
@@ -9,6 +9,11 @@ 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~
@@ -29,16 +34,18 @@ 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=-mc -lr -l=dos -wo -x# -d2##wwww
+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) vgmSnd.$(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)
 
-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 vgmsnd.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)
 
@@ -48,15 +55,15 @@ all: $(EXEC)
 #game and bakapi executables
 #
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
-	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=16.maw
+	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=16.map
 
 bakapi.exe: bakapi.$(OBJ) 16.lib
-	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) 16.lib -fm=bakapi.maw
+	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.maw
+	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) -fm=scroll.map
 scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
 
@@ -66,22 +73,22 @@ scroll.$(OBJ): $(SRC)scroll.c
 #	wcl $(FLAGS) -c $(SRC)sega.c
 
 test.exe: test.$(OBJ) gfx.lib
-	wcl $(FLAGS) test.$(OBJ) gfx.lib -fm=test.maw
+	wcl $(FLAGS) test.$(OBJ) gfx.lib -fm=test.map
 
 test2.exe: test2.$(OBJ) gfx.lib
-	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.maw
+	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map
 
 fonttest.exe: fonttest.$(OBJ) 16.lib
-	wcl $(FLAGS) fonttest.$(OBJ) 16.lib# -fm=fonttest.maw
+	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.maw
+	wcl $(FLAGS) fontgfx.$(OBJ) 16.lib -fm=fontgfx.map
 
 inputest.exe: inputest.$(OBJ) 16.lib
-	wcl $(FLAGS) -D__DEBUG_InputMgr__=1 inputest.$(OBJ) 16.lib -fm=inputest.maw
+	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
@@ -90,7 +97,7 @@ inputest.exe: inputest.$(OBJ) 16.lib
 #	wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
 
 tsthimem.exe: tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
-	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) -fm=tsthimem.maw
+	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) -fm=tsthimem.map
 
 #testemm.exe: testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
 #	wcl $(FLAGS) testemm.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
@@ -99,13 +106,13 @@ tsthimem.exe: tsthimem.$(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.maw
+	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map
 
 palettec.exe: palettec.$(OBJ) 16.lib
-	wcl $(FLAGS) palettec.$(OBJ) 16.lib -fm=palettec.maw
+	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 -fm=maptest.maw
+	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
@@ -117,13 +124,15 @@ maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 #	wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
 
 fmemtest.exe: fmemtest.$(OBJ) 16.lib
-	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib -fm=fmemtest.maw
+	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib -fm=fmemtest.map
 
 exmmtest.exe: exmmtest.$(OBJ) 16.lib
-	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.maw
+	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
 
-vgmtest.exe: vgmtest.$(OBJ) 16.lib
-	wcl $(FLAGS) vgmtest.$(OBJ) 16.lib -fm=vgmtest.maw
 
 #
 #executable's objects
@@ -193,18 +202,22 @@ exmmtest.$(OBJ): $(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 doslib.lib
-	wlib -b 16.lib $(16LIBOBJS) gfx.lib doslib.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 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
@@ -280,6 +293,10 @@ emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.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
 
@@ -288,6 +305,10 @@ kitten.$(OBJ): $(NYANLIB)kitten.h $(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
@@ -305,19 +326,22 @@ clean: .symbolic
 	@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) makefile~
-	@$(REMOVECOMMAND) __WCL__.LNK
+	@$(REMOVECOMMAND) __wcl__.LNK
 #	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
 	@$(REMOVECOMMAND) *.hed
 	@$(REMOVECOMMAND) *.MAP
-	@$(REMOVECOMMAND) *.maw
+	@$(REMOVECOMMAND) *.map
+	@$(REMOVECOMMAND) *.err
 	@$(COPYCOMMAND) .git/config git_con.fig
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
@@ -326,3 +350,5 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
+	@echo $(watcom)
+	@echo $(INCLUDE)