merged makefile

diff --cc 16.exe
index 0000000,ae70cf0..dc1c660
mode 000000,100644..100644
Binary files differ

diff --cc makefile
index 32cd430,e301d66..bd4c4ee
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -10,20 -10,22 +10,22 @@@ REMOVECOMMAND=de
  DIRSEP=\\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: 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
- \r
- #\r
- #executables\r
- #\r
- 16.exe: 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj\r
-       wcl $(FLAGS) 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj\r
- \r
- scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj\r
-       wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj# 16/lib/x/modex.lib\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 \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
        wcl $(FLAGS) -c $(SRC)scroll.c\r
  test.exe: test.obj modex16.obj bitmap.obj lib_head.obj\r
@@@ -75,29 -68,32 +77,32 @@@ test2.obj: $(SRC)test2.c $(SRCLIB)modex
        wcl $(FLAGS) -c $(SRC)test2.c\r
  \r
  pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
 -      wcl $(FLAGS) -c $(SRC)pcxtest.c
 -
 +      wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 +\r
  palettec.obj: $(SRC)palettec.c\r
 -      wcl $(FLAGS) -c $(SRC)palettec.c
 +      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
 -maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h
 -      wcl $(FLAGS) -c $(SRC)maptest.c
 -
  maptest0.obj: $(SRC)maptest0.c# $(SRCLIB)modex16.h\r
 -      wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
 -
 +      wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c\r
 +\r
  emmtest.obj: $(SRC)emmtest.c\r
        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c\r
 -
 +\r
  emsdump.obj: $(SRC)emsdump.c\r
 -      wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
 -
 +      wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c\r
 +\r
  fmemtest.obj: $(SRC)fmemtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c\r
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+ 
+ #
+ #non executable objects libraries
+ #
+ 16.lib: $(16LIBOBJS)\r
+       wlib -b 16.lib $(16LIBOBJS)
  \r
- #\r
- #non executable objects libraries\r
- #\r
  modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
  \r
@@@ -108,19 -104,19 +113,19 @@@ bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)
        wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
  \r
  planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c\r
 -      wcl $(FLAGS) -c $(SRCLIB)planar.c
 -
 +      wcl $(FLAGS) -c $(SRCLIB)planar.c\r
 +\r
  scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c\r
 -      wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 -
 +      wcl $(FLAGS) -c $(SRCLIB)scroll16.c\r
 +\r
  wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
 -      wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 +      wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
  \r
- mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
- \r
- fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c\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
+       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
  \r
  lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r

diff --cc scroll.exe
index 0000000,8886716..daf1175
mode 000000,100644..100644
Binary files differ