X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=f837ab538683f2a4d0ff8bc3b99dccdc235a0615;hb=ac433616341eec151bcf20baf4d8bf9bdb5ad8d9;hp=822004493d8e8929c012e8c5f4665cd6a4893755;hpb=6b585194480dbbfb1ca8ae9d4564418b24e79d48;p=16.git

diff --git a/makefile b/makefile
old mode 100644
new mode 100755
index 82200449..f837ab53
--- a/makefile
+++ b/makefile
@@ -1,9 +1,11 @@
 !ifdef __LINUX__
 REMOVECOMMAND=rm -f
+COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=o
 !else
 REMOVECOMMAND=del
+COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 !endif
@@ -12,25 +14,30 @@ TARGET_OS = dos
 #-zk0 = kanji support~
 #-zkl = current codepage
 
+#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
+NYANLIB=$(SRCLIB)nyan$(DIRSEP)
 #EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 DOSLIB=$(SRCLIB)doslib$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-ZFLAGS=-zk0 -zu -zc# -zm# -zdp# -zp16 -zq
-DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
-CFLAGS=-ei -wo -x -mc -r -fh=16.hed -k60000#16384#
-OFLAGS=-ot -ox -ob -oh -or -om -ol# -ol+
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS)
+16FLAGS=-fh=16.hed
+BAKAPIFLAGS=-fh=bakapi.hed
+SFLAGS=-sg -st -of+ -k32768 -zu -zdf -zff -zgf#51200#49152#24576
+DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
+ZFLAGS=-zk0 -zq -zc -zp8# -zm
+CFLAGS=-mc -lr -l=dos -wo -x## -d2
+OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
+FLAGS=$(OFLAGS) $(CFLAGS) $(DFLAGS) $(ZFLAGS)
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
-DOSLIBOBJ = adlib.$(OBJ) midi.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
-16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ)
+DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
+16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe sountest.exe tsthimem.exe inputest.exe scroll.exe
+TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe sountest.exe tsthimem.exe inputest.exe scroll.exe sega.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC)
 
@@ -40,10 +47,10 @@ all: $(EXEC)
 #game and bakapi executables
 #
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
-	wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 
 bakapi.exe: bakapi.$(OBJ) 16.lib
-	wcl $(FLAGS) bakapi.$(OBJ) 16.lib
+	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) 16.lib
 #
 #Test Executables!
 #
@@ -53,7 +60,7 @@ scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
 
 sega.exe: sega.$(OBJ)
-	wcl $(FLAGS) -c sega.$(OBJ)
+	wcl $(FLAGS) sega.$(OBJ)
 sega.$(OBJ): $(SRC)sega.c
 	wcl $(FLAGS) -c $(SRC)sega.c
 
@@ -78,8 +85,8 @@ inputest.exe: inputest.$(OBJ) 16.lib
 sountest.exe: sountest.$(OBJ) 16.lib
 	wcl $(FLAGS) sountest.$(OBJ) 16.lib
 
-miditest.exe: miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
-	wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
+miditest.exe: miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
+	wcl $(FLAGS) miditest.$(OBJ) 16.lib $(DOSLIBEXMMOBJ) midi.$(OBJ)
 
 tsthimem.exe: tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
 	wcl $(FLAGS) tsthimem.$(OBJ) 16.lib $(DOSLIBEXMMOBJ)
@@ -213,12 +220,15 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 16text.$(OBJ): $(SRCLIB)16text.c
 	wcl $(FLAGS) -c $(SRCLIB)16text.c
 
-mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
-	wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
+	wcl $(FLAGS) -c $(SRCLIB)mapread.c
 
 #fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
 #	wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
 
+timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c
+        wcl $(FLAGS) -c $(SRCLIB)timer.c
+
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
 	wcl $(FLAGS) -c $(SRCLIB)16_in.c
 
@@ -260,9 +270,15 @@ emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
 16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
 	wcl $(FLAGS) -c $(SRCLIB)16_head.c
 
+16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
+	wcl $(FLAGS) -c $(SRCLIB)16_hc.c
+
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
 	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
+kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
+        wcl $(FLAGS) -c $(NYANLIB)kitten.c
+
 #farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
 #	wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
 
@@ -281,8 +297,17 @@ clean: .symbolic
 	@wlib -n  doslib.lib
 	@$(REMOVECOMMAND) *.16
 	@$(REMOVECOMMAND) *.OBJ
+	@$(REMOVECOMMAND) *.BCO
 	@$(REMOVECOMMAND) makefi~1
 	@$(REMOVECOMMAND) makefile~
 	@$(REMOVECOMMAND) __WCL__.LNK
 #	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
+	@$(REMOVECOMMAND) *.hed
+#	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
+#	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)16_ca.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
+#	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)