X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=a48189fb5e02239642c145dd13054399cd79eb15;hb=ad4edb9455d67c97eb78b28a1bac60d89cd45bc6;hp=c3ac5e1bac8b2366b2a0cd4d901a4eaee5e743a5;hpb=d675110ddd67a0c92fe1a0695383ff2f4828a50b;p=16.git

diff --git a/makefile b/makefile
index c3ac5e1b..a48189fb 100755
--- a/makefile
+++ b/makefile
@@ -9,10 +9,10 @@ COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 !endif
-!ifndef INCLUDE
-IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h
-IFLAGS=-i=$(IN)
-!endif
+#!ifndef INCLUDE
+#IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h
+#IFLAGS=-i=$(IN)
+#!endif
 
 TARGET_OS = dos
 #-zk0u = translate kanji to unicode... wwww
@@ -31,26 +31,26 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 16FLAGS=-fh=16.hed
 BAKAPIFLAGS=-fh=bakapi.hed
-SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#60000
+SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k56000#60000#32768
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zq -zc -zp8# -zm
-CFLAGS=$(IFLAGS) -mc-lr -l=dos -wo# -d2##wwww
+CFLAGS=$(IFLAGS) -mh -lr -l=dos -wo# -d2##wwww
 OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
-VGMSNDOBJ = 16_snd.$(OBJ) vgmSnd.$(OBJ)
+VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(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) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ)
-#scroll16.$(OBJ)
+16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) scroll16.$(OBJ)
 #timer.$(OBJ)
 #3812intf.$(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 inputest.exe scroll.exe vgmtest.exe
-#tsthimem.exe
+TESTEXEC =  exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe
+# tsthimem.exe
+#inputest.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
-EXEC = 16.exe bakapi.exe $(TESTEXEC)
+EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
 
 all: $(EXEC)
 
@@ -65,11 +65,16 @@ bakapi.exe: bakapi.$(OBJ) 16.lib
 #
 #Test Executables!
 #
-scroll.exe: scroll.$(OBJ) scroll16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ) 16_in.$(OBJ) wcpu.$(OBJ)
-	wcl $(FLAGS) scroll.$(OBJ) scroll16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=scroll.map#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ)  16_in.$(OBJ) wcpu.$(OBJ)
+scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ) 16_in.$(OBJ) wcpu.$(OBJ)
+	wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=scroll.map#gfx.lib 16_head.$(OBJ) bakapee.$(OBJ)  16_in.$(OBJ) wcpu.$(OBJ)
 scroll.$(OBJ): $(SRC)scroll.c
 	wcl $(FLAGS) -c $(SRC)scroll.c
 
+tesuto.exe: tesuto.$(OBJ)
+	wcl -mh -d2 tesuto.$(OBJ)
+tesuto.$(OBJ): $(SRC)tesuto.c
+	wcl -mh -d2 -c $(SRC)tesuto.c
+
 #sega.exe: sega.$(OBJ)
 #	wcl $(FLAGS) sega.$(OBJ)
 #sega.$(OBJ): $(SRC)sega.c
@@ -114,6 +119,9 @@ pcxtest.exe: pcxtest.$(OBJ) gfx.lib
 palettec.exe: palettec.$(OBJ) 16.lib
 	wcl $(FLAGS) palettec.$(OBJ) 16.lib -fm=palettec.map
 
+pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
+	wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map
+
 maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
 	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib -fm=maptest.map
 
@@ -132,8 +140,10 @@ fmemtest.exe: fmemtest.$(OBJ) 16.lib
 exmmtest.exe: exmmtest.$(OBJ) 16.lib#16_head.$(OBJ) 16_mm.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
 	wcl $(FLAGS) exmmtest.$(OBJ) 16.lib -fm=exmmtest.map#16_head.$(OBJ) 16_mm.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
 
-vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib 16_in.$(OBJ) 16_head.$(OBJ)
-	wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map 16_in.$(OBJ) 16_head.$(OBJ)
+# vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib 16_in.$(OBJ) 16_head.$(OBJ)
+# 	wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map 16_in.$(OBJ) 16_head.$(OBJ)
+vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib 16.lib
+	wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map 16.lib
 	#====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map
 
 
@@ -155,6 +165,9 @@ test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
 pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
 	wcl $(FLAGS) -c $(SRC)pcxtest.c
 
+pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h
+	wcl $(FLAGS) -c $(SRC)pcxtest2.c
+
 palettec.$(OBJ): $(SRC)palettec.c
 	wcl $(FLAGS) -c $(SRC)palettec.c
 
@@ -353,5 +366,13 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
-	@echo $(watcom)
-	@echo $(INCLUDE)
+#	@echo $(watcom)
+#	@echo $(INCLUDE)
+
+comp: .symbolic
+	upx -9 $(EXEC)
+
+updatelibs: .symbolic
+	cd $(JSMNLIB)
+	git pull
+	cd ../../../