code miraculously works on real hardware

[16.git] / makefile

diff --git a/makefile b/makefile
index 49420404ee74cdaf4981f338f9389827a22f161a..733a24fb0bce00fcb7a14cf5baae1caea43b2d59 100755 (executable)
--- 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
@@ -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)
@@ -203,7 +203,6 @@ TESTEXEC = &
        vgmtest.exe &
        sountest.exe &
        imfplay.exe &
-       sdtest.exe &
        xcroll.exe &
        0croll.exe &
        1croll.exe &
@@ -214,6 +213,7 @@ TESTEXEC = &
        maptest.exe &
        vrldbg.exe
 #zcroll.exe &
+#sdtest.exe &  //disabled due to fuckery
 TESTEXEC2 = &
        pcxtest.exe &
        scroll.exe &
@@ -429,7 +429,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 +444,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~
@@ -618,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