X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=fb475d5d279b947097a4b9b0abdbb26868b65f0c;hb=86619c6a50b07c52481161da4b549ffb5e403e66;hp=6c97f4e4fae4f6574dc736390ea2055cd3a8a95c;hpb=96dd0791aae1ca753abc0f19aaaf1db2122f971f;p=16.git

diff --git a/makefile b/makefile
index 6c97f4e4..fb475d5d 100755
--- a/makefile
+++ b/makefile
@@ -135,7 +135,8 @@ LIBFLAGS=$(WLIBQ) -b -n
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 #OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) $(OLDLIBOBJS)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_in.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+16LIBNOINOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = $(16LIBNOINOBJS) 16_in.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -195,7 +196,8 @@ TESTEXEC = &
 	zcroll.exe &
 	inputest.exe &
 	vrstest.exe &
-	maptest.exe
+	maptest.exe &
+	inntest.exe
 TESTEXEC2 = &
 	pcxtest.exe &
 	scroll.exe &
@@ -261,6 +263,7 @@ fonttest.exe:	 fonttest.$(OBJ) gfx.lib
 #fonttes0.exe:	fonttes0.$(OBJ) $(16LIB)
 fontgfx.exe:	fontgfx.$(OBJ) gfx.lib $(DOSLIB)
 inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
+inntest.exe:	 	inntest.$(OBJ)	$(16LIBNOINOBJS) 16_in_1.$(OBJ)
 #sountest.exe:	sountest.$(OBJ) $(16LIB)
 pcxtest.exe:	pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -301,6 +304,7 @@ fonttest.$(OBJ):$(SRC)/fonttest.c
 #fonttes0.$(OBJ): $(SRC)/fonttes0.c
 fontgfx.$(OBJ):$(SRC)/fontgfx.c
 inputest.$(OBJ):$(SRC)/inputest.c
+inntest.$(OBJ):$(SRC)/inntest.c
 #sountest.$(OBJ): $(SRC)/sountest.c
 #miditest.$(OBJ): $(SRC)/miditest.c
 #testemm.$(OBJ):$(SRC)/testemm.c
@@ -355,10 +359,12 @@ mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
 16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h
 16_in.$(OBJ):	 $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h
+16_in_1.$(OBJ):	 $(SRCLIB)/16_in_1.c $(SRCLIB)/16_in_1.h
 16_rf.$(OBJ):	 $(SRCLIB)/16_rf.c	$(SRCLIB)/16_rf.h
 16_mm.$(OBJ):	 $(SRCLIB)/16_mm.c	$(SRCLIB)/16_mm.h
 16_pm.$(OBJ):	 $(SRCLIB)/16_pm.c	$(SRCLIB)/16_pm.h
 16_ca.$(OBJ):	 $(SRCLIB)/16_ca.c	$(SRCLIB)/16_ca.h
+16_us.$(OBJ):	 $(SRCLIB)/16_us.c
 16_dbg.$(OBJ):	$(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
 midi.$(OBJ):	$(SRCLIB)/midi.c $(SRCLIB)/midi.h
 16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h
@@ -379,6 +385,7 @@ ll.$(OBJ):		$(SRCLIB)/ll.c	$(SRCLIB)/ll.h
 #
 clean: .symbolic
 	@if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
+	@wmake -h initscript
 	@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
 	@if exist *.LIB $(REMOVECOMMAND) *.LIB
@@ -428,7 +435,7 @@ backupconfig: .symbolic
 	@$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
 	@$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
 
-initconfig:
+initconfig: .symbolic
 	@$(COPYCOMMAND) $(GITCONFIGDIR)/git_con.fig .git/config
 	@$(COPYCOMMAND) $(GITCONFIGDIR)/git_modu.les .gitmodules
 	@$(COPYCOMMAND) $(GITCONFIGDIR)/git_igno.re .gitignore
@@ -439,13 +446,16 @@ backupscript: .symbolic
 	@if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
 !ifdef __LINUX__
 	@if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
+	@if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
 !endif
+	@if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh ./
+	@if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT ./
 
 initscript: .symbolic
-	@if not exist *.bat $(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
-	@if not exist *.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
 !ifdef __LINUX__
-	@if not exist *.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
+	@$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
 !endif