X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=810ed020e7d1c10f6a58eec0de91ec00d0ef3b06;hb=cf3bed60e91dc628e3bb76aaae3f0f8222ac3c38;hp=4a15a25b05f21a4c43d556c471bef4b99e9cb604;hpb=bb4878674a36456e85b10dc2607444caba597528;p=16.git

diff --git a/makefile b/makefile
index 4a15a25b..810ed020 100644
--- a/makefile
+++ b/makefile
@@ -1,120 +1,191 @@
-#-zk0u = translate kanji to unicode... wwww
-#-zk0 = kanji support~
-#-zkl = current codepage
-
-MFLAGS=-mh# -zm
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
-OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 $(OFLAGS) $(CFLAGS)
-REMOVECOMMAND=del
-DIRSEP=\
-SRC=src$(DIRSEP)
-SRCLIB=$(SRC)lib$(DIRSEP)
+!ifdef __LINUX__
+REMOVECOMMAND=rm
+DIRSEP=/
+OBJ=o
+!else
+REMOVECOMMAND=del
+DIRSEP=\
+OBJ=obj
+!endif
+TARGET_OS = dos
+#-zk0u = translate kanji to unicode... wwww
+#-zk0 = kanji support~
+#-zkl = current codepage
+
+#MFLAGS=-mc# -zm
+CFLAGS=-zkl -wo -x -mc# -zdp# -zp16 -zq
+OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
+FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
+SRC=src$(DIRSEP)
+SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
-EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
-
-all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe
+EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
+
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ) 16_ca.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
+
+all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
 
 #
 #executables
-#
-scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj
-	wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib
-scroll.obj: $(SRC)scroll.c
-	wcl $(FLAGS) -c $(SRC)scroll.c
-test.exe: test.obj modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) test.obj modex16.obj bitmap.obj lib_head.obj
-
-test2.exe: test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj
-	wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj
-
-pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj lib_head.obj
-
-maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj
-
-maptest0.exe: maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj
-	wcl $(FLAGS) $(MFLAGS) maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj
-
-emmtest.exe: emmtest.obj memory.obj
-	wcl $(FLAGS) $(MFLAGS) emmtest.obj memory.obj
-
-emsdump.exe: emsdump.obj memory.obj
-	wcl $(FLAGS) $(MFLAGS) emsdump.obj memory.obj
-
-fmemtest.exe: fmemtest.obj# memory.obj
-	wcl $(FLAGS) $(MFLAGS) fmemtest.obj# memory.obj
+#
+16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+
+scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
+	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
+scroll.$(OBJ): $(SRC)scroll.c
+	wcl $(FLAGS) -c $(SRC)scroll.c
+test.exe: test.$(OBJ) gfx.lib
+	wcl $(FLAGS) test.$(OBJ) gfx.lib
+
+test2.exe: test2.$(OBJ) gfx.lib
+	wcl $(FLAGS) test2.$(OBJ) gfx.lib
+
+fonttest.exe: fonttest.$(OBJ) 16.lib
+	wcl $(FLAGS) fonttest.$(OBJ) 16.lib
+
+inputest.exe: inputest.$(OBJ) 16.lib
+	wcl $(FLAGS) inputest.$(OBJ) 16.lib
+
+pcxtest.exe: pcxtest.$(OBJ) gfx.lib
+	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib
+
+palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
+	wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
+
+maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+
+#maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
+#	wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
+
+#emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)
+#	wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)
+
+#emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
+#	wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
+
+fmemtest.exe: fmemtest.$(OBJ) 16.lib
+	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
+
+exmmtest.exe: exmmtest.$(OBJ) 16.lib
+        wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
 
 #
 #executable's objects
-#
-test.obj: $(SRC)test.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)test.c
-
-test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)test2.c
-
-pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)pcxtest.c
-
-maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h
+#
+16.$(OBJ): $(SRC)16.h $(SRC)16.c
+	wcl $(FLAGS) -c $(SRC)16.c
+
+test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)test.c
+
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)test2.c
+
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)pcxtest.c
+
+palettec.$(OBJ): $(SRC)palettec.c
+	wcl $(FLAGS) -c $(SRC)palettec.c
+
+maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)maptest.c
 
-maptest0.obj: $(SRC)maptest0.c# $(SRCLIB)modex16.h
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
+#maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
 
-emmtest.obj: $(SRC)emmtest.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
+#emmtest.$(OBJ): $(SRC)emmtest.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
 
-emsdump.obj: $(SRC)emsdump.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
+#emsdump.$(OBJ): $(SRC)emsdump.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
 
-fmemtest.obj: $(SRC)fmemtest.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+fmemtest.$(OBJ): $(SRC)fmemtest.c
+	wcl $(FLAGS) -c $(SRC)fmemtest.c
+
+fonttest.$(OBJ): $(SRC)fonttest.c
+	wcl -c $(SRC)fonttest.c
+
+inputest.$(OBJ): $(SRC)inputest.c
+	wcl $(FLAGS) -c $(SRC)inputest.c
+
+exmmtest.$(OBJ): $(SRC)exmmtest.c
+	wcl $(FLAGS) -c $(SRC)exmmtest.c
 
 #
 #non executable objects libraries
-#
-modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
-	wcl $(FLAGS) -c $(SRCLIB)modex16.c
-
-dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
-	wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
-
-bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
-	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
-
-planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c
-	wcl $(FLAGS) -c $(SRCLIB)planar.c
-
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c
-	wcl $(FLAGS) -c $(SRCLIB)mapread.c
-
-fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c
-
-lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
-	wcl $(FLAGS) -c $(SRCLIB)lib_head.c
-
-jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
+#
+16.lib: $(16LIBOBJS) gfx.lib
+	wlib -b 16.lib $(16LIBOBJS) gfx.lib
+
+gfx.lib: $(GFXLIBOBJS)
+	wlib -b gfx.lib $(GFXLIBOBJS)
+
+modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
+	wcl $(FLAGS) -c $(SRCLIB)modex16.c
+
+#dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
+#	wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
+
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
+	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
+
+planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
+	wcl $(FLAGS) -c $(SRCLIB)planar.c
+
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
+	wcl $(FLAGS) -c $(SRCLIB)scroll16.c
+
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
+	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
+
+16text.$(OBJ): $(SRCLIB)16text.c
+	wcl -c $(SRCLIB)16text.c
+
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
+	wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+
+#fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
+#	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
+
+16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
+	wcl $(FLAGS) -c $(SRCLIB)16_in.c
+
+16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
+	wcl $(FLAGS) -c $(SRCLIB)16_mm.c
+
+16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
+	wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+
+16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
+	wcl $(FLAGS) -c $(SRCLIB)16_head.c
+
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
-farjsmn.obj: $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
-	wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
+#farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
 
-memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c
-	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
+#memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
+#	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
 
 #
 #other~
-#
-clean: .symbolic
-#	@$(REMOVECOMMAND) *.obj
-	@$(REMOVECOMMAND) *.OBJ
-#	@$(REMOVECOMMAND) *.out
-#	@$(REMOVECOMMAND) *.OUT
-	@$(REMOVECOMMAND) makefi~1
-	@$(REMOVECOMMAND) __WCL__.LNK
-#	@$(REMOVECOMMAND) *.smp
-	@$(REMOVECOMMAND) *.SMP
+#
+clean: .symbolic
+	@$(REMOVECOMMAND) *.$(OBJ)
+	@$(REMOVECOMMAND) *.lib
+	@wlib -n 16.lib
+	@wlib -n  gfx.lib
+#	@$(REMOVECOMMAND) *.OBJ
+#	@$(REMOVECOMMAND) *.out
+#	@$(REMOVECOMMAND) *.OUT
+#	@$(REMOVECOMMAND) makefi~1
+#	@$(REMOVECOMMAND) makefile~
+	@$(REMOVECOMMAND) __WCL__.LNK
+#	@$(REMOVECOMMAND) *.smp
+	@$(REMOVECOMMAND) *.SMP
+