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 7b0c773e772abb972fbefaf8c1f826799c53cf88..cff92b3c3f01a31c014eb7a6a722f6801ea62a42 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ FUCK
 *.ERR\r
 makefile~\r
 !boop.sh\r
+!awoo.sh\r
+!lowcase.sh\r
 !wmakegnu.sh\r
 img\r
 !.git/config\r

diff --git a/awoo.sh b/awoo.sh
new file mode 100644 (file)
index 0000000..9e26c56
--- /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 93bba4ac95232499c0d7ae9936cac41eb088ad87..f593c84e2e4fa13fd8aadb54ce2513e6c9493bbb 100644 (file)
--- 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 (file)
index 0000000..a9baf48
--- /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 bd4c4eedf27726edfd9c266816704ab6d902d6b2..588ffa575877a318e357e14097c01f9fca4af037 100644 (file)
--- a/makefile
+++ b/makefile
@@ -5,145 +5,146 @@
 MFLAGS=-mh# -zm\r
 CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq\r
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+\r
-FLAGS=-0 -d2 $(OFLAGS) $(CFLAGS)\r
+FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)\r
 REMOVECOMMAND=del\r
 DIRSEP=\\r
+OBJ=obj\r
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)\r
-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
-\r
-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 \r
-
-#
-#executables
-#
-16.exe: 16.obj mapread.obj jsmn.obj 16.lib
-       wcl $(FLAGS) 16.obj mapread.obj jsmn.obj 16.lib
-\r
-scroll.exe: scroll.obj 16.lib mapread.obj jsmn.obj\r
-       wcl $(FLAGS) scroll.obj 16.lib mapread.obj jsmn.obj\r
-scroll.obj: $(SRC)scroll.c\r
+JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)\r
+EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
+\r
+16LIBOBJS = modex16.$(OBJ) dos_kb.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ)\r
+\r
+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 \r
+\r
+#\r
+#executables\r
+#\r
+16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
+       wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
+\r
+scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)\r
+       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)\r
+scroll.$(OBJ): $(SRC)scroll.c\r
        wcl $(FLAGS) -c $(SRC)scroll.c\r
-test.exe: test.obj modex16.obj bitmap.obj lib_head.obj\r
-       wcl $(FLAGS) test.obj modex16.obj bitmap.obj lib_head.obj\r
+test.exe: test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
 \r
-test2.exe: test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
-       wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
+test2.exe: test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
 \r
-ftest.exe: text.obj ftest.obj\r
-       wcl $(FLAGS) ftest.obj text.obj\r
+fonttest.exe: text.$(OBJ) fonttest.$(OBJ)\r
+       wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)\r
 \r
-text.obj: $(SRCLIB)text.c\r
-       wcl -c $(SRCLIB)text.c\r
+16text.$(OBJ): $(SRCLIB)16text.c\r
+       wcl -c $(SRCLIB)16text.c\r
 \r
-ftest.obj: $(SRC)ftest.c\r
-       wcl -c $(SRC)ftest.c\r
+fonttest.$(OBJ): $(SRC)fonttest.c\r
+       wcl -c $(SRC)fonttest.c\r
 \r
-pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
-       wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
+pcxtest.exe: pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
 \r
-palettec.exe: palettec.obj modex16.obj\r
-       wcl $(FLAGS) palettec.obj modex16.obj\r
+palettec.exe: palettec.$(OBJ) modex16.$(OBJ)\r
+       wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)\r
 \r
-maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
-       wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
+maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
 \r
-maptest0.exe: maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj\r
-       wcl $(FLAGS) $(MFLAGS) maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj\r
+maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
 \r
-emmtest.exe: emmtest.obj memory.obj\r
-       wcl $(FLAGS) $(MFLAGS) emmtest.obj memory.obj\r
+emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)\r
 \r
-emsdump.exe: emsdump.obj memory.obj\r
-       wcl $(FLAGS) $(MFLAGS) emsdump.obj memory.obj\r
+emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)\r
 \r
-fmemtest.exe: fmemtest.obj# memory.obj\r
-       wcl $(FLAGS) $(MFLAGS) fmemtest.obj# memory.obj\r
+fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)\r
 \r
 #\r
 #executable's objects\r
 #\r
-16.obj: $(SRC)16.h $(SRC)16.c\r
+16.$(OBJ): $(SRC)16.h $(SRC)16.c\r
        wcl $(FLAGS) -c $(SRC)16.c\r
 \r
-test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
+test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r
 \r
-test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h\r
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test2.c\r
 \r
-pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 \r
-palettec.obj: $(SRC)palettec.c\r
+palettec.$(OBJ): $(SRC)palettec.c\r
        wcl $(FLAGS) -c $(SRC)palettec.c\r
 \r
-maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h\r
+maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)maptest.c\r
 \r
-maptest0.obj: $(SRC)maptest0.c# $(SRCLIB)modex16.h\r
+maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c\r
 \r
-emmtest.obj: $(SRC)emmtest.c\r
+emmtest.$(OBJ): $(SRC)emmtest.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c\r
 \r
-emsdump.obj: $(SRC)emsdump.c\r
+emsdump.$(OBJ): $(SRC)emsdump.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c\r
 \r
-fmemtest.obj: $(SRC)fmemtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
-
-#
-#non executable objects libraries
-#
+fmemtest.$(OBJ): $(SRC)fmemtest.c\r
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c\r
+\r
+#\r
+#non executable objects libraries\r
+#\r
 16.lib: $(16LIBOBJS)\r
-       wlib -b 16.lib $(16LIBOBJS)
+       wlib -b 16.lib $(16LIBOBJS)\r
 \r
-modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
+modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
-dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
+dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
        wcl $(FLAGS) -c $(SRCLIB)dos_kb.c\r
 \r
-bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
        wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
 \r
-planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
+planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c\r
        wcl $(FLAGS) -c $(SRCLIB)planar.c\r
 \r
-scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c\r
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c\r
        wcl $(FLAGS) -c $(SRCLIB)scroll16.c\r
 \r
-wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
        wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
 \r
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
-
-fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib\r
+       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib\r
+\r
+fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
 \r
-lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
+lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
 \r
-jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
        wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
 \r
-farjsmn.obj: $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c\r
+farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c\r
 \r
-memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
+memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c\r
 \r
 #\r
 #other~\r
 #\r
 clean: .symbolic\r
-#      @$(REMOVECOMMAND) *.obj\r
+#      @$(REMOVECOMMAND) *.$(OBJ)\r
        @$(REMOVECOMMAND) *.OBJ\r
 #      @$(REMOVECOMMAND) *.out\r
 #      @$(REMOVECOMMAND) *.OUT\r

diff --git a/makefile.gnu b/makefile.gnu
index c3446540ae92f7bfeb48be2006788b1246381eb6..7c41e3b4b7ea3978b51dd66cf69c3fdf54594998 100644 (file)
--- a/makefile.gnu
+++ b/makefile.gnu
@@ -3,114 +3,148 @@
 #-zkl = current codepage\r
 \r
 MFLAGS=-mh# -zm\r
-CFLAGS=-zkl -wo -x #### -mc# -zdp# -zp16 -zq\r
+CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq\r
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+\r
-FLAGS=-0 -d2 -l=dos -bt=dos $(OFLAGS) $(CFLAGS)\r
+FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)\r
 REMOVECOMMAND=rm\r
 DIRSEP=/\r
+OBJ=o\r
 SRC=src$(DIRSEP)\r
 SRCLIB=$(SRC)lib$(DIRSEP)\r
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)\r
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
 \r
-all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe\r
+16LIBOBJS = modex16.$(OBJ) dos_kb.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ)\r
+\r
+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 \r
 \r
 #\r
 #executables\r
 #\r
-scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj\r
-       wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib\r
-scroll.obj: $(SRC)scroll.c\r
+16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
+       wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
+\r
+scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)\r
+       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ)\r
+scroll.$(OBJ): $(SRC)scroll.c\r
        wcl $(FLAGS) -c $(SRC)scroll.c\r
-test.exe: test.obj modex16.obj bitmap.obj lib_head.obj\r
-       wcl $(FLAGS) test.obj modex16.obj bitmap.obj lib_head.obj\r
+test.exe: test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+\r
+test2.exe: test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+\r
+fonttest.exe: text.$(OBJ) fonttest.$(OBJ)\r
+       wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)\r
+\r
+16text.$(OBJ): $(SRCLIB)16text.c\r
+       wcl -c $(SRCLIB)16text.c\r
+\r
+fonttest.$(OBJ): $(SRC)fonttest.c\r
+       wcl -c $(SRC)fonttest.c\r
 \r
-test2.exe: test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
-       wcl $(FLAGS) test2.obj modex16.obj bitmap.obj planar.obj lib_head.obj\r
+pcxtest.exe: pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
 \r
-pcxtest.exe: pcxtest.obj modex16.obj bitmap.obj lib_head.obj\r
-       wcl $(FLAGS) pcxtest.obj modex16.obj bitmap.obj lib_head.obj\r
+palettec.exe: palettec.$(OBJ) modex16.$(OBJ)\r
+       wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)\r
 \r
-maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
-       wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj\r
+maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
 \r
-maptest0.exe: maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj\r
-       wcl $(FLAGS) $(MFLAGS) maptest0.obj fmapread.obj farjsmn.obj# modex16.obj bitmap.obj lib_head.obj\r
+maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
 \r
-emmtest.exe: emmtest.obj memory.obj\r
-       wcl $(FLAGS) $(MFLAGS) emmtest.obj memory.obj\r
+emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)\r
 \r
-emsdump.exe: emsdump.obj memory.obj\r
-       wcl $(FLAGS) $(MFLAGS) emsdump.obj memory.obj\r
+emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)\r
 \r
-fmemtest.exe: fmemtest.obj# memory.obj\r
-       wcl $(FLAGS) $(MFLAGS) fmemtest.obj# memory.obj\r
+fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)\r
+       wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)\r
 \r
 #\r
 #executable's objects\r
 #\r
-test.obj: $(SRC)test.c $(SRCLIB)modex16.h\r
+16.$(OBJ): $(SRC)16.h $(SRC)16.c\r
+       wcl $(FLAGS) -c $(SRC)16.c\r
+\r
+test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test.c\r
 \r
-test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h\r
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)test2.c\r
 \r
-pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 \r
-maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h\r
+palettec.$(OBJ): $(SRC)palettec.c\r
+       wcl $(FLAGS) -c $(SRC)palettec.c\r
+\r
+maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h\r
        wcl $(FLAGS) -c $(SRC)maptest.c\r
 \r
-maptest0.obj: $(SRC)maptest0.c# $(SRCLIB)modex16.h\r
+maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c\r
 \r
-emmtest.obj: $(SRC)emmtest.c\r
+emmtest.$(OBJ): $(SRC)emmtest.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c\r
 \r
-emsdump.obj: $(SRC)emsdump.c\r
+emsdump.$(OBJ): $(SRC)emsdump.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c\r
 \r
-fmemtest.obj: $(SRC)fmemtest.c\r
+fmemtest.$(OBJ): $(SRC)fmemtest.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c\r
 \r
 #\r
 #non executable objects libraries\r
 #\r
-modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
+16.lib: $(16LIBOBJS)\r
+       wlib -b 16.lib $(16LIBOBJS)\r
+\r
+modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
-dos_kb.obj: $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
+dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
        wcl $(FLAGS) -c $(SRCLIB)dos_kb.c\r
 \r
-bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
        wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
 \r
-planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
+planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c\r
        wcl $(FLAGS) -c $(SRCLIB)planar.c\r
 \r
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c\r
+       wcl $(FLAGS) -c $(SRCLIB)scroll16.c\r
+\r
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
+       wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
+\r
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib\r
+       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib\r
 \r
-fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c\r
+fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
+       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
 \r
-lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
+lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
 \r
-jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
        wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
 \r
-farjsmn.obj: $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c\r
+farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c\r
 \r
-memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
+memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c\r
 \r
 #\r
 #other~\r
 #\r
 clean: .symbolic\r
-#      @$(REMOVECOMMAND) *.obj\r
+#      @$(REMOVECOMMAND) *.$(OBJ)\r
        @$(REMOVECOMMAND) *.OBJ\r
 #      @$(REMOVECOMMAND) *.out\r
 #      @$(REMOVECOMMAND) *.OUT\r

diff --git a/ptmp.pcx b/ptmp.pcx
deleted file mode 100644 (file)
index 3b95631..0000000
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 cb37a1be459f3ac45fb452d34f0ffe7a10c869c4..8c5bfcd33461f217b386c76c33a5652202623004 100644 (file)
--- a/src/FTEST.C
+++ b/src/fonttest.c
@@ -22,7 +22,7 @@
 #include <stdio.h>\r
 #include <conio.h>\r
 #include "lib/types.h"\r
-#include "lib/text.h"\r
+#include "lib/16text.h"\r
 \r
 void main(int argc, char *argv[])\r
 {\r

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 107f8e94ec75557cd79d1d50d1a6874a35efc915..59420b5c4be76289e7f5486bfb0885cadc0a585e 100644 (file)
--- a/src/lib/TEXT.C
+++ b/src/lib/16text.c
@@ -1,4 +1,4 @@
-#include "text.h"\r
+#include "16text.h"\r
 \r
 /* this array holds the rom font descriptors */\r
 font_t romFonts[4];\r

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 68b3df9eb5e31b0041742aa8d120380c38dfb2a8..77563ae9351812069a410954548f90e7984a7b02 100644 (file)
--- a/wmakegnu.sh
+++ b/wmakegnu.sh
@@ -1,2 +1,2 @@
-#/bin/bash
+#!/bin/bash
 wmake -f makefile.gnu