X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=8a8567516874011af112dc72921a510d35485140;hb=073bfdabe4ed1e8cac83ba123c222a9b2949f897;hp=e446b1e608e6e2a5364b8428ada723bb5d46cf9a;hpb=a5e0539a4401e3c312227f374d1958baf25a0692;p=16.git

diff --git a/makefile b/makefile
index e446b1e6..8a856751 100644
--- a/makefile
+++ b/makefile
@@ -1,24 +1,31 @@
+!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=-m# -zm
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
+#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)
-REMOVECOMMAND=del
-DIRSEP=\
-OBJ=obj
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+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 maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
+all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
 
 #
 #executables
@@ -30,11 +37,11 @@ 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) 16.lib
-	wcl $(FLAGS) test.$(OBJ) 16.lib
+test.exe: test.$(OBJ) gfx.lib
+	wcl $(FLAGS) test.$(OBJ) gfx.lib
 
-test2.exe: test2.$(OBJ) 16.lib
-	wcl $(FLAGS) test2.$(OBJ) 16.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
@@ -42,8 +49,8 @@ fonttest.exe: fonttest.$(OBJ) 16.lib
 inputest.exe: inputest.$(OBJ) 16.lib
 	wcl $(FLAGS) inputest.$(OBJ) 16.lib
 
-pcxtest.exe: pcxtest.$(OBJ) 16.lib
-	wcl $(FLAGS) pcxtest.$(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)
@@ -51,20 +58,20 @@ palettec.exe: 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
+#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)
+#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)
+#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)
+fmemtest.exe: fmemtest.$(OBJ) 16.lib
+	wcl $(FLAGS) fmemtest.$(OBJ) 16.lib
 
-exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
-        wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)
+exmmtest.exe: exmmtest.$(OBJ) 16.lib
+        wcl $(FLAGS) exmmtest.$(OBJ) 16.lib
 
 #
 #executable's objects
@@ -87,17 +94,17 @@ palettec.$(OBJ): $(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
+	wcl $(FLAGS) -c $(SRC)fmemtest.c
 
 fonttest.$(OBJ): $(SRC)fonttest.c
 	wcl -c $(SRC)fonttest.c
@@ -106,7 +113,7 @@ inputest.$(OBJ): $(SRC)inputest.c
 	wcl $(FLAGS) -c $(SRC)inputest.c
 
 exmmtest.$(OBJ): $(SRC)exmmtest.c
-	wcl $(FLAGS) $(MFLAGS) -c $(SRC)exmmtest.c
+	wcl $(FLAGS) -c $(SRC)exmmtest.c
 
 #
 #non executable objects libraries
@@ -120,8 +127,8 @@ 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
+#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
@@ -141,26 +148,29 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.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
+#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) $(MFLAGS) -c $(SRCLIB)16_mm.c
+	wcl $(FLAGS) -c $(SRCLIB)16_mm.c
 
-lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
-	wcl $(FLAGS) -c $(SRCLIB)lib_head.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~
@@ -174,3 +184,4 @@ clean: .symbolic
 	@$(REMOVECOMMAND) __WCL__.LNK
 #	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
+