X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=733a24fb0bce00fcb7a14cf5baae1caea43b2d59;hb=6d8fd0880da9336bd0b5008f67168de2c0db5bec;hp=a655ce6c536a69f3f312b2cca0a7e761ca9c0967;hpb=a461c2a942ae4da5bd241da41bbb15731192a091;p=16.git

diff --git a/makefile b/makefile
index a655ce6c..733a24fb 100755
--- a/makefile
+++ b/makefile
@@ -83,7 +83,7 @@ MODEXLIB=$(SRCLIB)/modex
 VGMSNDLIB=$(SRCLIB)/vgmsnd
 DOSLIBDIR=$(SRCLIB)/doslib
 WCPULIB=$(SRCLIB)/wcpu
-OLDMODEX16LIBDIR=16/modex16
+OLDMODEX16LIBDIR=16$(DIRSEP)modex16
 #16/$(SRCLIB)
 
 DOSLIB_CPU=$(DOSLIBDIR)/hw/cpu
@@ -144,8 +144,8 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
-GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) scroll16.$(OBJ) 16_spri.$(OBJ)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16_sd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(OBJ)
+GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) scroll16.$(OBJ) 16_spri.$(OBJ) gamepal.$(OBJ)
+16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ)  16_map.$(OBJ) 16_sd.$(OBJ) 16_snd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -202,6 +202,7 @@ TESTEXEC = &
 	exmmtest.exe &
 	vgmtest.exe &
 	sountest.exe &
+	imfplay.exe &
 	xcroll.exe &
 	0croll.exe &
 	1croll.exe &
@@ -210,10 +211,9 @@ TESTEXEC = &
 	tesuto.exe &
 	0tesuto.exe &
 	maptest.exe &
-	imfplay.exe &
-	i0fplay.exe &
 	vrldbg.exe
 #zcroll.exe &
+#sdtest.exe &	//disabled due to fuckery
 TESTEXEC2 = &
 	pcxtest.exe &
 	scroll.exe &
@@ -226,17 +226,21 @@ TESTEXEC3= &
 	pcxtest2.exe
 UTILEXEC = &
 	palettel.exe &
-	palllist.exe &
 	palbomb.exe &
 	palettec.exe &
 	ps.exe
+#	fd-dbg.exe
 !ifdef __LINUX__
 SPRIUTILEXEC = &
 	pcx2vrl &
 	pcxsscut &
 	vrl2vrs &
 	vrsdump &
-	vrldbg
+	vrldbg &
+	dro2imf &
+	dro2vgm &
+	imf2vgm &
+	raw2vgm
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
@@ -265,7 +269,7 @@ testexec: $(EXEC) $(TESTEXEC2)
 # game and bakapi executables
 #
 16.exe:		16.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-bakapi.exe:		bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) $(DOSLIB) 16_wcpu.$(OBJ)# gfx.lib
+bakapi.exe:		bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) $(DOSLIB) 16_wcpu.$(OBJ) gamepal.$(OBJ)# gfx.lib
 sp2.exe:		sp2.$(OBJ)
 
 #
@@ -291,7 +295,7 @@ fontgfx.exe:	fontgfx.$(OBJ) gfx.lib $(DOSLIB)
 inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 sountest.exe:	sountest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 imfplay.exe:		imfplay.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
-i0fplay.exe:		i0fplay.$(OBJ) $(DOSLIB)
+sdtest.exe:	sdtest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 vrldbg.exe:		vrldbg.$(OBJ) #gfx.lib $(DOSLIB)
 pcxtest.exe:	pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -299,7 +303,6 @@ vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palettec.exe:	palettec.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palettel.exe:	 	palettel.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palbomb.exe: 	palbomb.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-palllist.exe:	 	palllist.$(OBJ) $(16LIB) gfx.lib $(DOSLIB) ll.$(OBJ)
 pcxtest2.exe:	pcxtest2.$(OBJ) gfx.lib $(DOSLIB)
 #planrpcx.exe:	planrpcx.$(OBJ) gfx.lib
 maptest.exe:	maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
@@ -310,6 +313,7 @@ exmmtest.exe:	exmmtest.$(OBJ)	$(16LIB) gfx.lib $(DOSLIB)
 vgmtest.exe:	vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) gfx.lib
 db.exe:		db.$(OBJ)
 ps.exe:		ps.$(OBJ) 16_head.$(OBJ)
+fd-dbg.exe:	fd-dbg.$(OBJ) 16_head.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
 wcpu.exe:		wcpu.$(OBJ) $(16LIB) $(DOSLIB)
 
 #
@@ -330,7 +334,6 @@ pcxtest2.$(OBJ):$(SRC)/pcxtest2.c	$(SRCLIB)/16_vl.h
 palettec.$(OBJ):	$(SRC)/palettec.c
 palettel.$(OBJ):	$(SRC)/palettel.c
 palbomb.$(OBJ):	$(SRC)/palbomb.c
-palllist.$(OBJ):	$(SRC)/palllist.c
 maptest.$(OBJ):$(SRC)/maptest.c	$(SRCLIB)/16_vl.h
 #emmtest.$(OBJ):$(SRC)/emmtest.c
 #emsdump.$(OBJ):$(SRC)/emsdump.c
@@ -340,9 +343,9 @@ fonttest.$(OBJ):$(SRC)/fonttest.c
 fontgfx.$(OBJ):$(SRC)/fontgfx.c
 inputest.$(OBJ):$(SRC)/inputest.c
 #inntest.$(OBJ):$(SRC)/inntest.c
-sountest.$(OBJ): $(SRC)/sountest.c
+sountest.$(OBJ):	$(SRC)/sountest.c
+sdtest.$(OBJ):	$(SRC)/sdtest.c
 imfplay.$(OBJ): $(SRC)/imfplay.c
-i0fplay.$(OBJ): $(SRC)/i0fplay.c
 vrldbg.$(OBJ):	$(SRC)/vrldbg.c
 #miditest.$(OBJ): $(SRC)/miditest.c
 #testemm.$(OBJ):$(SRC)/testemm.c
@@ -352,6 +355,7 @@ exmmtest.$(OBJ):$(SRC)/exmmtest.c
 vgmtest.$(OBJ):$(SRC)/vgmtest.c
 db.$(OBJ):		$(UTIL)/db.c
 ps.$(OBJ):		$(SRC)/ps.c
+fd-dbg.$(OBJ):		$(SRC)/fd-dbg.c
 
 #
 # non executable objects libraries
@@ -399,6 +403,7 @@ opltest.exe:
 16_vl.$(OBJ):	$(SRCLIB)/16_vl.c	$(SRCLIB)/16_vl.h
 16_vl_1.$(OBJ):	$(SRCLIB)/16_vl_1.c	$(SRCLIB)/16_vl.h
 16_vlpal.$(OBJ):	$(SRCLIB)/16_vlpa_.c	$(SRCLIB)/16_vlpal.c	$(SRCLIB)/16_vlpal.h
+gamepal.$(OBJ):	$(SRCLIB)/gamepal.c
 bakapee.$(OBJ):	$(SRCLIB)/bakapee.c	$(SRCLIB)/bakapee.h
 16planar.$(OBJ):	$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
 #16_vrs.$(OBJ):	$(SRCLIB)/16_vrs.c	$(SRCLIB)/16_vrs.h $(DOSLIB)
@@ -422,8 +427,9 @@ mapread.$(OBJ):	$(SRCLIB)/mapread.c	$(SRCLIB)/mapread.h
 16_tail.$(OBJ):	$(SRCLIB)/16_tail.c	$(SRCLIB)/16_tail.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
 16_sd.$(OBJ):	$(SRCLIB)/16_sd.c	$(SRCLIB)/16_sd.h
-jsmn.$(OBJ):	$(JSMNLIB)/jsmn.c	$(JSMNLIB)/jsmn.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
 16_wcpu.$(OBJ):	$(WCPULIB)/16_wcpu.c	$(WCPULIB)/16_wcpu.h
@@ -431,7 +437,6 @@ vgmSnd.$(OBJ):	$(VGMSNDLIB)/vgmSnd.c	$(VGMSNDLIB)/vgmSnd.h
 #midi.$(OBJ):	$(SRCLIB)/midi.c
 c_utils.$(OBJ):	$(MODEXLIB)/c_utils.asm
 modex.$(OBJ):	$(MODEXLIB)/modex.asm
-ll.$(OBJ):		$(SRCLIB)/ll.c	$(SRCLIB)/ll.h
 bitmapl.$(OBJ):	$(SRCLIB)/bitmapl.c	$(SRCLIB)/bitmapl.h
 
 #
@@ -439,31 +444,30 @@ bitmapl.$(OBJ):	$(SRCLIB)/bitmapl.c	$(SRCLIB)/bitmapl.h
 #
 0croll.exe:	0croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# $(OLDLIBOBJS) omodex16.$(OBJ)# 16_ino.$(OBJ)
 	wcl -0 $(WCLQ) 0croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# omodex16.$(OBJ) bitmap.$(OBJ)# 16_ino.$(OBJ)
-0croll.$(OBJ):	$(SRC)/0croll.c
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c src/0croll.c
+0croll.$(OBJ):	$(SRC)$(DIRSEP)0croll.c
+	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(SRC)$(DIRSEP)0croll.c
 1croll.exe:	1croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# $(OLDLIBOBJS) omodex16.$(OBJ)# 16_ino.$(OBJ)
 	wcl -0 $(WCLQ) 1croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# omodex16.$(OBJ) bitmap.$(OBJ)# 16_ino.$(OBJ)
-1croll.$(OBJ):	$(SRC)/1croll.c
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c src/1croll.c
-#16render.$(OBJ):	$(OLDMODEX16LIBDIR)/16render.c	$(OLDMODEX16LIBDIR)/16render.h
-#	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/16render.c
-bitmap.$(OBJ):	$(OLDMODEX16LIBDIR)/bitmap.c	$(OLDMODEX16LIBDIR)/bitmap.h
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/bitmap.c
-#omodex16.$(OBJ):	$(OLDMODEX16LIBDIR)/omodex16.c	$(OLDMODEX16LIBDIR)/omodex16.h
-#	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/omodex16.c
-modex16.$(OBJ):	$(OLDMODEX16LIBDIR)/modex16.c	$(OLDMODEX16LIBDIR)/modex16.h
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/modex16.c
-#16_ino.$(OBJ):	$(SRCLIB)/16_in.c	$(SRCLIB)/16_in.h
-#	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=16_ino.$(OBJ) -c src/lib/16_in.c
-dos_kb.$(OBJ):	$(OLDMODEX16LIBDIR)/dos_kb.c	$(OLDMODEX16LIBDIR)/dos_kb.h
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/dos_kb.c
+1croll.$(OBJ):	$(SRC)$(DIRSEP)1croll.c
+	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(SRC)$(DIRSEP)1croll.c
+#16render.$(OBJ):	$(OLDMODEX16LIBDIR)$(DIRSEP)16render.c	$(OLDMODEX16LIBDIR)$(DIRSEP)16render.h
+#	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)16render.c
+bitmap.$(OBJ):	$(OLDMODEX16LIBDIR)$(DIRSEP)bitmap.c	$(OLDMODEX16LIBDIR)$(DIRSEP)bitmap.h
+	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)bitmap.c
+#omodex16.$(OBJ):	$(OLDMODEX16LIBDIR)$(DIRSEP)omodex16.c	$(OLDMODEX16LIBDIR)$(DIRSEP)omodex16.h
+#	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)omodex16.c
+modex16.$(OBJ):	$(OLDMODEX16LIBDIR)$(DIRSEP)modex16.c	$(OLDMODEX16LIBDIR)$(DIRSEP)modex16.h
+	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)modex16.c
+#16_ino.$(OBJ):	$(SRCLIB)$(DIRSEP)16_in.c	$(SRCLIB)$(DIRSEP)16_in.h
+#	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=16_ino.$(OBJ) -c $(SRC)$(DIRSEP)lib$(DIRSEP)16_in.c
+dos_kb.$(OBJ):	$(OLDMODEX16LIBDIR)$(DIRSEP)dos_kb.c	$(OLDMODEX16LIBDIR)$(DIRSEP)dos_kb.h
+	wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)dos_kb.c
 
 #
 #other~
 #
 clean: .symbolic
 	@if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
-	@if not exist ps.exe wmake -s -h ps.exe
 	@wmake -s -h initscript
 	@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
@@ -473,6 +477,8 @@ clean: .symbolic
 	@if exist *.OBJ $(REMOVECOMMAND) *.OBJ
 	#@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 	@if not exist vrl2vrs wmake -s -h pcx2vrl
+	@if not exist dro2imf wmake -s -h drotoimf
+	@if not exist raw2vgm wmake -s -h vgmtools
 !else
 	@if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -501,6 +507,7 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
+#	@if not exist ps.exe wmake -s -h ps.exe
 
 nuke: .symbolic
 	@wmake clean
@@ -552,10 +559,16 @@ www: .symbolic
 	@if exist 16.exe @wmake -s -h wwwdo
 	@if exist 16.exe @wmake -s -h wwwext
 
-wwwdo: .symbolic
+cleanwww:	.symbolic
+wwwclean:	.symbolic
+wwwcl:		.symbolic
+clwww:		.symbolic
 	@for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
 	@$(REMOVECOMMAND) /var/www/*.exe.zi*
 	@$(REMOVECOMMAND) /var/www/*.zip.zi*
+
+wwwdo: .symbolic
+	@wmake clwww
 	@for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
 	@./src/util/z.sh $(EXEC) $(EXEC)
 	@./src/util/z2.sh data.zip data
@@ -605,6 +618,7 @@ cldl: .symbolic
 uplibs: .symbolic
 	@cd $(JSMNLIB:$(to_os_path))
 	@git pull
+	#@git checkout 18e9fe42cbfe21d65076f5c77ae2be379ad1270f
 	@cd $(BUILD_ROOT)
 	@cd $(DOSLIBDIR:$(to_os_path))
 	@git pull
@@ -618,6 +632,8 @@ reinitlibs: .symbolic
 	@$(REMOVECOMMAND) -rf 16/keen
 	@$(REMOVECOMMAND) -rf 16/Catacomb3D
 	@$(REMOVECOMMAND) -rf 16/shitman
+	@$(REMOVECOMMAND) -rf 16/dro2imf
+	@$(REMOVECOMMAND) -rf 16/vgmtools
 	@wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -628,6 +644,8 @@ initlibs: .symbolic
 	@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
+	@git clone https://github.com/Malvineous/dro2imf.git
+	@git clone https://github.com/vgmrips/vgmtools.git
 	@cd $(BUILD_ROOT)
 	@$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 
@@ -666,6 +684,20 @@ mx_: .symbolic
 	@cd $(BUILD_ROOT)
 
 !ifdef __LINUX__
+drotoimf: .symbolic
+	@cd 16/dro2imf
+	@make
+	@$(MOVECOMMAND) dro2imf ../..
+	@cd $(BUILD_ROOT)
+
+vgmtools: .symbolic
+	@cd 16/vgmtools
+	@make
+	@$(MOVECOMMAND) dro2vgm ../..
+	@$(MOVECOMMAND) imf2vgm ../..
+	@$(MOVECOMMAND) raw2vgm ../..
+	@cd $(BUILD_ROOT)
+
 vrs: .symbolic
 vrl: .symbolic
 $(SPRIUTILEXEC):