From: sparky4 <sparky4@cock.li>
Date: Mon, 22 Jun 2015 21:05:30 +0000 (-0500)
Subject: cleanings~
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=562a5008d417d162e2f133b2eea7e5bb37a3070c;p=16.git

cleanings~
	modified:   .gitignore
	new file:   awoo.sh
	modified:   boop.sh
	renamed:    FTEST.EXE -> fonttest.exe
	new file:   lowcase.sh
	modified:   makefile
	modified:   makefile.gnu
	deleted:    ptmp.pcx
	renamed:    src/FTEST.C -> src/fonttest.c
	renamed:    src/lib/TEXT.C -> src/lib/16text.c
	renamed:    src/lib/TEXT.H -> src/lib/16text.h
	modified:   wmakegnu.sh
---

diff --git a/.gitignore b/.gitignore
index 7b0c773e..cff92b3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ FUCK
 *.ERR
 makefile~
 !boop.sh
+!awoo.sh
+!lowcase.sh
 !wmakegnu.sh
 img
 !.git/config
diff --git a/awoo.sh b/awoo.sh
new file mode 100644
index 00000000..9e26c560
--- /dev/null
+++ b/awoo.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+git add .
+bash ./boop.sh
diff --git a/boop.sh b/boop.sh
index 93bba4ac..f593c84e 100644
--- a/boop.sh
+++ b/boop.sh
@@ -1,5 +1,6 @@
+#!/bin/bash
 git commit -a
-#git push x4 master
+####git push x4 master
 git push origin master
 git push jp master
 git push hub master
diff --git a/FTEST.EXE b/fonttest.exe
similarity index 100%
rename from FTEST.EXE
rename to fonttest.exe
diff --git a/lowcase.sh b/lowcase.sh
new file mode 100644
index 00000000..a9baf48f
--- /dev/null
+++ b/lowcase.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+mv "$1" "$1"0
+mv "$1"0 "$2"
diff --git a/makefile b/makefile
index bd4c4eed..588ffa57 100644
--- a/makefile
+++ b/makefile
@@ -5,145 +5,146 @@
 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)
+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 = modex16.obj dos_kb.obj bitmap.obj planar.obj wcpu.obj lib_head.obj scroll16.obj
-
-all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe ftest.exe 
-
-#
-#executables
-#
-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
-	wcl $(FLAGS) scroll.obj 16.lib mapread.obj jsmn.obj
-scroll.obj: $(SRC)scroll.c
+JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
+EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
+
+16LIBOBJS = modex16.$(OBJ) dos_kb.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ)
+
+all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe 
+
+#
+#executables
+#
+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)
+	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
+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
+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
+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)
 
-ftest.exe: text.obj ftest.obj
-	wcl $(FLAGS) ftest.obj text.obj
+fonttest.exe: text.$(OBJ) fonttest.$(OBJ)
+	wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)
 
-text.obj: $(SRCLIB)text.c
-	wcl -c $(SRCLIB)text.c
+16text.$(OBJ): $(SRCLIB)16text.c
+	wcl -c $(SRCLIB)16text.c
 
-ftest.obj: $(SRC)ftest.c
-	wcl -c $(SRC)ftest.c
+fonttest.$(OBJ): $(SRC)fonttest.c
+	wcl -c $(SRC)fonttest.c
 
-pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj planar.obj lib_head.obj
-	wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj planar.obj lib_head.obj
+pcxtest.exe: pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)
+	wcl $(FLAGS) pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)
 
-palettec.exe: palettec.obj modex16.obj
-	wcl $(FLAGS) palettec.obj modex16.obj
+palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
+	wcl $(FLAGS) palettec.$(OBJ) modex16.$(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
+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
+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
+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)# memory.$(OBJ)
+	wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)
 
 #
 #executable's objects
 #
-16.obj: $(SRC)16.h $(SRC)16.c
+16.$(OBJ): $(SRC)16.h $(SRC)16.c
 	wcl $(FLAGS) -c $(SRC)16.c
 
-test.obj: $(SRC)test.c $(SRCLIB)modex16.h
+test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test.c
 
-test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test2.c
 
-pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.c
 
-palettec.obj: $(SRC)palettec.c
+palettec.$(OBJ): $(SRC)palettec.c
 	wcl $(FLAGS) -c $(SRC)palettec.c
 
-maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h
+maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)maptest.c
 
-maptest0.obj: $(SRC)maptest0.c# $(SRCLIB)modex16.h
+maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h
 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
 
-emmtest.obj: $(SRC)emmtest.c
+emmtest.$(OBJ): $(SRC)emmtest.c
 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
 
-emsdump.obj: $(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
-
-#
-#non executable objects libraries
-#
+fmemtest.$(OBJ): $(SRC)fmemtest.c
+	wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+
+#
+#non executable objects libraries
+#
 16.lib: $(16LIBOBJS)
-	wlib -b 16.lib $(16LIBOBJS)
+	wlib -b 16.lib $(16LIBOBJS)
 
-modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
+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
+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
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
 
-planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c
+planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
 	wcl $(FLAGS) -c $(SRCLIB)planar.c
 
-scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
 	wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 
-wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 	wcl $(FLAGS) -c $(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
+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
 
-lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.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
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
-farjsmn.obj: $(JSMNLIB)farjsmn.h $(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
+memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
 	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
 
 #
 #other~
 #
 clean: .symbolic
-#	@$(REMOVECOMMAND) *.obj
+#	@$(REMOVECOMMAND) *.$(OBJ)
 	@$(REMOVECOMMAND) *.OBJ
 #	@$(REMOVECOMMAND) *.out
 #	@$(REMOVECOMMAND) *.OUT
diff --git a/makefile.gnu b/makefile.gnu
index c3446540..7c41e3b4 100644
--- a/makefile.gnu
+++ b/makefile.gnu
@@ -3,114 +3,148 @@
 #-zkl = current codepage
 
 MFLAGS=-mh# -zm
-CFLAGS=-zkl -wo -x #### -mc# -zdp# -zp16 -zq
+CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 -l=dos -bt=dos $(OFLAGS) $(CFLAGS)
+FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
 REMOVECOMMAND=rm
 DIRSEP=/
+OBJ=o
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe
+16LIBOBJS = modex16.$(OBJ) dos_kb.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ)
+
+all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.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
+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)
+	wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)
+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
+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)
+
+fonttest.exe: text.$(OBJ) fonttest.$(OBJ)
+	wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)
+
+16text.$(OBJ): $(SRCLIB)16text.c
+	wcl -c $(SRCLIB)16text.c
+
+fonttest.$(OBJ): $(SRC)fonttest.c
+	wcl -c $(SRC)fonttest.c
 
-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) planar.$(OBJ) lib_head.$(OBJ)
+	wcl $(FLAGS) pcxtest.$(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
+palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
+	wcl $(FLAGS) palettec.$(OBJ) modex16.$(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
+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
+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
+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)# memory.$(OBJ)
+	wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)
 
 #
 #executable's objects
 #
-test.obj: $(SRC)test.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
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)test2.c
 
-pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.c
 
-maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h
+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
+maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h
 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
 
-emmtest.obj: $(SRC)emmtest.c
+emmtest.$(OBJ): $(SRC)emmtest.c
 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
 
-emsdump.obj: $(SRC)emsdump.c
+emsdump.$(OBJ): $(SRC)emsdump.c
 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
 
-fmemtest.obj: $(SRC)fmemtest.c
+fmemtest.$(OBJ): $(SRC)fmemtest.c
 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
 
 #
 #non executable objects libraries
 #
-modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
+16.lib: $(16LIBOBJS)
+	wlib -b 16.lib $(16LIBOBJS)
+
+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
+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
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
 	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
 
-planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.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
+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
+
+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
-	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c
+fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
+	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
 
-lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.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
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
-farjsmn.obj: $(JSMNLIB)farjsmn.h $(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
+memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
 	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
 
 #
 #other~
 #
 clean: .symbolic
-#	@$(REMOVECOMMAND) *.obj
+#	@$(REMOVECOMMAND) *.$(OBJ)
 	@$(REMOVECOMMAND) *.OBJ
 #	@$(REMOVECOMMAND) *.out
 #	@$(REMOVECOMMAND) *.OUT
diff --git a/ptmp.pcx b/ptmp.pcx
deleted file mode 100644
index 3b956313..00000000
Binary files a/ptmp.pcx and /dev/null differ
diff --git a/src/FTEST.C b/src/fonttest.c
similarity index 93%
rename from src/FTEST.C
rename to src/fonttest.c
index cb37a1be..8c5bfcd3 100644
--- a/src/FTEST.C
+++ b/src/fonttest.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <conio.h>
 #include "lib/types.h"
-#include "lib/text.h"
+#include "lib/16text.h"
 
 void main(int argc, char *argv[])
 {
diff --git a/src/lib/TEXT.C b/src/lib/16text.c
similarity index 94%
rename from src/lib/TEXT.C
rename to src/lib/16text.c
index 107f8e94..59420b5c 100644
--- a/src/lib/TEXT.C
+++ b/src/lib/16text.c
@@ -1,4 +1,4 @@
-#include "text.h"
+#include "16text.h"
 
 /* this array holds the rom font descriptors */
 font_t romFonts[4];
diff --git a/src/lib/TEXT.H b/src/lib/16text.h
similarity index 100%
rename from src/lib/TEXT.H
rename to src/lib/16text.h
diff --git a/wmakegnu.sh b/wmakegnu.sh
index 68b3df9e..77563ae9 100644
--- a/wmakegnu.sh
+++ b/wmakegnu.sh
@@ -1,2 +1,2 @@
-#/bin/bash
+#!/bin/bash
 wmake -f makefile.gnu