16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / makefile

diff --git a/makefile b/makefile
index 542a5db052b0c2741e4975215d4a607e1d6a4834..5c21b2ad782cbf256212191df6b5a115e5543cae 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -83,6 +83,8 @@ MODEXLIB=$(SRCLIB)/modex
 VGMSNDLIB=$(SRCLIB)/vgmsnd
 DOSLIBDIR=$(SRCLIB)/doslib
 WCPULIB=$(SRCLIB)/wcpu
+OLDMODEX16LIBDIR=16/modex16
+#16/$(SRCLIB)
 
 DOSLIB_CPU=$(DOSLIBDIR)/hw/cpu
 DOSLIB_DOS=$(DOSLIBDIR)/hw/dos
@@ -199,7 +201,7 @@ TESTEXEC = &
        inputest.exe &
        vrstest.exe &
        tesuto.exe &
-       0.exe &
+       0tesuto.exe &
        maptest.exe &
        imfplay.exe
 #zcroll.exe &
@@ -264,8 +266,8 @@ zcroll.exe: zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ): $(SRC)/zcroll.c
 tesuto.exe:    tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
 tesuto.$(OBJ): $(SRC)/tesuto.c
-0.exe:                 0.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-0.$(OBJ):               $(SRC)/0.c
+0tesuto.exe:                   0tesuto.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+0tesuto.$(OBJ):                 $(SRC)/0tesuto.c
 vidtest.exe:            vidtest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 #test2.exe:    test2.$(OBJ) gfx.lib $(DOSLIB)
 test0.exe:             test0.$(OBJ)
@@ -414,18 +416,22 @@ ll.$(OBJ):                $(SRCLIB)/ll.c  $(SRCLIB)/ll.h
 #
 # old 16 lib
 #
-0croll.exe:    0croll.$(OBJ) $(OLDLIBOBJS) omodex16.$(OBJ) 16_ino.$(OBJ)
-       wcl -0 $(WCLQ) 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_ino.$(OBJ)
+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
-16render.$(OBJ):       16/$(SRCLIB)/16render.c 16/$(SRCLIB)/16render.h
-       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/16render.c
-bitmap.$(OBJ): 16/$(SRCLIB)/bitmap.c   16/$(SRCLIB)/bitmap.h
-       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/bitmap.c
-omodex16.$(OBJ):       16/$(SRCLIB)/omodex16.c 16/$(SRCLIB)/omodex16.h
-       wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/omodex16.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
+#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
 
 #
 #other~