From: Robert Lowe <robert.lowe@maryvillecollege.edu>
Date: Mon, 22 Jun 2015 04:22:12 +0000 (-0400)
Subject: merged makefile
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=dbdb9d6358e433ed1fb79c7e691078e73dfa0afb;p=16.git

merged makefile
---

dbdb9d6358e433ed1fb79c7e691078e73dfa0afb
diff --cc 16.exe
index 00000000,ae70cf09..dc1c660c
mode 000000,100644..100644
Binary files differ
diff --cc makefile
index 32cd4308,e301d66b..bd4c4eed
--- a/makefile
+++ b/makefile
@@@ -10,20 -10,22 +10,22 @@@ REMOVECOMMAND=de
  DIRSEP=\
  SRC=src$(DIRSEP)
  SRCLIB=$(SRC)lib$(DIRSEP)
- JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
- EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
- WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
- 
- 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 modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj
- 	wcl $(FLAGS) 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj
- 
- scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj
- 	wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj# 16/lib/x/modex.lib
+ 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 
++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
  	wcl $(FLAGS) -c $(SRC)scroll.c
  test.exe: test.obj modex16.obj bitmap.obj lib_head.obj
@@@ -75,29 -68,32 +77,32 @@@ test2.obj: $(SRC)test2.c $(SRCLIB)modex
  	wcl $(FLAGS) -c $(SRC)test2.c
  
  pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h
 -	wcl $(FLAGS) -c $(SRC)pcxtest.c
 -
 +	wcl $(FLAGS) -c $(SRC)pcxtest.c
 +
  palettec.obj: $(SRC)palettec.c
 -	wcl $(FLAGS) -c $(SRC)palettec.c
 +	wcl $(FLAGS) -c $(SRC)palettec.c
 +
 +maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h
 +	wcl $(FLAGS) -c $(SRC)maptest.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
 -
 +	wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.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
 -
 +	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
 +
  fmemtest.obj: $(SRC)fmemtest.c
- 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+ 	wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+ 
+ #
+ #non executable objects libraries
+ #
+ 16.lib: $(16LIBOBJS)
+ 	wlib -b 16.lib $(16LIBOBJS)
  
- #
- #non executable objects libraries
- #
  modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c
  	wcl $(FLAGS) -c $(SRCLIB)modex16.c
  
@@@ -108,19 -104,19 +113,19 @@@ bitmap.obj: $(SRCLIB)bitmap.h $(SRCLIB)
  	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
  
  planar.obj: $(SRCLIB)planar.h $(SRCLIB)planar.c
 -	wcl $(FLAGS) -c $(SRCLIB)planar.c
 -
 +	wcl $(FLAGS) -c $(SRCLIB)planar.c
 +
  scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
 -	wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 -
 +	wcl $(FLAGS) -c $(SRCLIB)scroll16.c
 +
  wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 -	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 +	wcl $(FLAGS) -c $(WCPULIB)wcpu.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
+ 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
  	wcl $(FLAGS) -c $(SRCLIB)lib_head.c
diff --cc scroll.exe
index 00000000,88867163..daf1175c
mode 000000,100644..100644
Binary files differ