X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=f97dce255774bf9a120a3e31ecafa835e295916e;hb=d6bf85570f22605fec8f47fc66f19eb5ac9a7c03;hp=49420404ee74cdaf4981f338f9389827a22f161a;hpb=7546211d6de190a33b63eca728777c8b79d00550;p=16.git

diff --git a/makefile b/makefile
index 49420404..f97dce25 100755
--- a/makefile
+++ b/makefile
@@ -67,8 +67,8 @@ TARGET_OS = dos
 MEMORYMODE = l
 
 BUILD_ROOT=$+$(%__CWD__)$-
-#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
-DATADIR=data$(DIRSEP)
+#EXMMTESTDIR=16/exmmtest/
+DATADIR=data/
 SPRI=$(DATADIR)/spri
 SRC=src
 UTIL=$(SRC)/util
@@ -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
@@ -145,7 +145,7 @@ 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) 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) jsmn.$(OBJ) 16_map.$(OBJ) 16_sd.$(OBJ) 16_snd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(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)
@@ -193,7 +193,6 @@ LIBMAKERULE=*wlib $(LIBFLAGS) $(extra_$^&_lib_opts)$@ $<
 # List of executables to build
 #
 EXTERNTESTEXEC = &
-	joytest.exe &
 	wcpu.exe &
 	db.exe
 TESTEXEC = &
@@ -203,7 +202,6 @@ TESTEXEC = &
 	vgmtest.exe &
 	sountest.exe &
 	imfplay.exe &
-	sdtest.exe &
 	xcroll.exe &
 	0croll.exe &
 	1croll.exe &
@@ -214,6 +212,7 @@ TESTEXEC = &
 	maptest.exe &
 	vrldbg.exe
 #zcroll.exe &
+#sdtest.exe &	//disabled due to fuckery
 TESTEXEC2 = &
 	pcxtest.exe &
 	scroll.exe &
@@ -231,6 +230,9 @@ UTILEXEC = &
 	ps.exe
 #	fd-dbg.exe
 !ifdef __LINUX__
+DOSLIBTESTEXEC = &
+	joytest.exe &
+	opltest.exe
 SPRIUTILEXEC = &
 	pcx2vrl &
 	pcxsscut &
@@ -248,8 +250,7 @@ EXEC = &
 	16.exe &
 	bakapi.exe &
 	$(TESTEXEC) &
-	$(UTILEXEC) &
-	opltest.exe
+	$(UTILEXEC)
 
 #!ifdef __LINUX__
 #EXEC += $(SPRIUTILEXEC)
@@ -326,33 +327,33 @@ vidtest.$(OBJ):	$(SRC)/vidtest.c	$(SRCLIB)/16_vl.h
 psltest.$(OBJ):	$(SRC)/paltest.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
+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
+pcxtest2.$(OBJ): $(SRC)/pcxtest2.c	$(SRCLIB)/16_vl.h
 palettec.$(OBJ):	$(SRC)/palettec.c
 palettel.$(OBJ):	$(SRC)/palettel.c
 palbomb.$(OBJ):	$(SRC)/palbomb.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
+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
-#inntest.$(OBJ):$(SRC)/inntest.c
+fontgfx.$(OBJ): $(SRC)/fontgfx.c
+inputest.$(OBJ): $(SRC)/inputest.c
+#inntest.$(OBJ): $(SRC)/inntest.c
 sountest.$(OBJ):	$(SRC)/sountest.c
 sdtest.$(OBJ):	$(SRC)/sdtest.c
 imfplay.$(OBJ): $(SRC)/imfplay.c
 vrldbg.$(OBJ):	$(SRC)/vrldbg.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):		$(UTIL)/db.c
 ps.$(OBJ):		$(SRC)/ps.c
 fd-dbg.$(OBJ):		$(SRC)/fd-dbg.c
@@ -372,33 +373,55 @@ doslib.lib: $(DOSLIBLIBS)
 #
 # library deps 16-bit large
 $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib:
-	cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_CPU:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 $(DOSLIB_DOS)/$(DOSLIB_MEMMODE)/dos.lib:
-	cd $(DOSLIB_DOS:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_DOS:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vgatty.lib:
-	cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_VGA:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vga.lib:
-	cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_VGA:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 $(DOSLIB_8250)/$(DOSLIB_MEMMODE)/8250.lib:
-	cd $(DOSLIB_8250:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_8250:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 $(DOSLIB_8254)/$(DOSLIB_MEMMODE)/8254.lib:
-	cd $(DOSLIB_8254:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_8254:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 $(DOSLIB_8259)/$(DOSLIB_MEMMODE)/8259.lib:
-	cd $(DOSLIB_8259:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_8259:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 $(DOSLIB_ADLIB)/$(DOSLIB_MEMMODE)/adlib.lib:
-	cd $(DOSLIB_ADLIB:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+	cd $(DOSLIB_ADLIB:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
 
 joytest.exe:
-	cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
-	$(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe joytest.exe
+	cd $(DOSLIB_JOYSTICK:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
+	$(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))/$(DOSLIB_MEMMODE)/test.exe joytest.exe
 
 #imfplay.exe:
-#	cd $(DOSLIB_ADLIB:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
-#	$(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)imfplay.exe imfplay.exe
+#	cd $(DOSLIB_ADLIB:$(to_os_path))
+#	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+#	cd $(BUILD_ROOT)
+#	$(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))/$(DOSLIB_MEMMODE)/imfplay.exe imfplay.exe
 
 opltest.exe:
-	cd $(DOSLIB_ADLIB:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
-	$(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe opltest.exe
+	cd $(DOSLIB_ADLIB:$(to_os_path))
+	$(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+	cd $(BUILD_ROOT)
+	$(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))/$(DOSLIB_MEMMODE)/test.exe 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
@@ -429,7 +452,7 @@ mapread.$(OBJ):	$(SRCLIB)/mapread.c	$(SRCLIB)/mapread.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
@@ -444,24 +467,24 @@ 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~
@@ -517,7 +540,7 @@ nuke: .symbolic
 	@wmake comp
 
 backupconfig: .symbolic
-	@$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)/git_con.fig
+	@$(COPYCOMMAND) .git/config $(GITCONFIGDIR)/git_con.fig
 	@$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
 	@$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
 
@@ -618,6 +641,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
@@ -666,19 +690,19 @@ initshitman: .symbolic
 ##	experimental libs
 ##
 xlib: .symbolic
-	@cd 16$(DIRSEP)xlib
+	@cd 16/xlib
 	@wmake -s -h clean
 	@wmake -s -h all
 	@cd $(BUILD_ROOT)
 
 mx: .symbolic
-	@cd 16$(DIRSEP)xw
+	@cd 16/xw
 #	@wmake clean
 	@wmake -s -h all
 	@cd $(BUILD_ROOT)
 
 mx_: .symbolic
-	@cd 16$(DIRSEP)xw_
+	@cd 16/xw_
 	@wmake -s -h -f makefile all
 	@cd $(BUILD_ROOT)
 
@@ -703,6 +727,6 @@ $(SPRIUTILEXEC):
 	@cd $(DOSLIB_VGA:$(to_os_path))
 	#@make clean
 	@make all
-	@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#$(DIRSEP)
+	@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#/
 	@cd $(BUILD_ROOT)
 !endif