OSDN Git Service

(root) / proj16 / 16.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
====----==== this is a messed up build that contains a busted 0.exe pan page system
[proj16/16.git] / makefile
diff --git a/makefile b/makefile
index 9943051..c054683 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -82,11 +82,17 @@ DOSLIB_JOYSTICK=$(DOSLIBDIR)/hw/joystick
 DOSLIB_MEMMODE=dos86$(MEMORYMODE)
 
 # remote host (for sparky4)
-HOSTUSER=wwc001
-HOSTADDR=beta.latech.edu
-HOSTDIR=~/public_html/
+HOSTUSER=sparky4
+HOSTADDR=4ch.mooo.com
+HOSTDIR=/var/www/
 #ssh port
-HOSTPORT=22
+HOSTPORT=26
+# 2nd remote host (for sparky4)
+HOST2USER=wwc001
+HOST2ADDR=beta.latech.edu
+HOST2DIR=~/public_html/
+#ssh port
+HOST2PORT=22
 
 #
 # quiet flags
@@ -100,7 +106,7 @@ UPXQ=-qqq
 #
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768
 Z_FLAGS=-zk0 -zc -zp8 -zm
-O_FLAGS=-obmilr -oe=24 -outpack -ei -ohnl+                             -zp4
+O_FLAGS=-opmilr -oe=24 -outback -ei -ohnl+                             -zp4
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1##-fo=.$(OBJ) -e=65536
 
 DBUGFLAGS=-fm=$^&.mah -fd=$^&
@@ -119,7 +125,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_enti.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -171,6 +177,7 @@ EXTERNTESTEXEC = &
        wcpu.exe &
        db.exe
 TESTEXEC = &
+       test.exe &
        tesuto.exe &
        0.exe &
        exmmtest.exe &
@@ -178,21 +185,30 @@ TESTEXEC = &
        scroll.exe &
        zcroll.exe &
        inputest.exe &
+       pcxtest.exe &
        vrstest.exe
 TESTEXEC2 = &
        maptest.exe &
        fmemtest.exe &
        fonttest.exe &
        fontgfx.exe &
-       test.exe &
        test0.exe &
-       pcxtest.exe &
        $(EXTERNTESTEXEC)
 TESTEXEC3= &
        pcxtest2.exe
 UTILEXEC = &
        palettel.exe &
+       palllist.exe &
        palettec.exe
+!ifdef __LINUX__
+SPRIUTILEXEC = &
+       pcx2vrl &
+       pcxsscut &
+       vrl2vrs &
+       vrsdump
+#UTILEXEC += $(SPRIUTILEXEC)
+!endif
+
 EXEC = &
        16.exe &
        bakapi.exe &
@@ -230,8 +246,9 @@ inputest.exe:        inputest.$(OBJ) $(16LIB) $(DOSLIB)
 pcxtest.exe:   pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:   vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 #vgacamm.exe:  vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-palettec.exe:   palettec.$(OBJ) gfx.lib $(DOSLIB)
-palettel.exe:   palettel.$(OBJ) gfx.lib $(DOSLIB)
+palettec.exe:  palettec.$(OBJ) gfx.lib $(DOSLIB)
+palettel.exe:          palettel.$(OBJ) gfx.lib $(DOSLIB)
+palllist.exe:          palllist.$(OBJ) gfx.lib $(DOSLIB)
 pcxtest2.exe:   pcxtest2.$(OBJ) gfx.lib $(DOSLIB)
 #planrpcx.exe: planrpcx.$(OBJ) gfx.lib
 maptest.exe:   maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
@@ -254,8 +271,9 @@ vrstest.$(OBJ):$(SRC)/vrstest.c $(SRCLIB)/16_vl.h
 #vgacamm.$(OBJ):$(SRC)/vgacamm.c $(SRCLIB)/16_vl.h
 #planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/16_vl.h
 pcxtest2.$(OBJ):$(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h
-palettec.$(OBJ):$(SRC)/palettec.c
-palettel.$(OBJ):$(SRC)/palettel.c
+palettec.$(OBJ):       $(SRC)/palettec.c
+palettel.$(OBJ):       $(SRC)/palettel.c
+palllist.$(OBJ):       $(SRC)/palllist.c
 maptest.$(OBJ):$(SRC)/maptest.c $(SRCLIB)/16_vl.h
 #emmtest.$(OBJ):$(SRC)/emmtest.c
 #emsdump.$(OBJ):$(SRC)/emsdump.c
@@ -312,13 +330,15 @@ bitmap.$(OBJ):    $(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h
 planar.$(OBJ): $(SRCLIB)/planar.c $(SRCLIB)/planar.h
 scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
 16text.$(OBJ): $(SRCLIB)/16text.c $(SRCLIB)/16text.h
+16_enti.$(OBJ):        $(SRCLIB)/16_enti.c $(SRCLIB)/16_enti.h
 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_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_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_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
@@ -359,6 +379,7 @@ clean: .symbolic
        @if exist *.mah $(REMOVECOMMAND) *.mah
        @if exist *.MAH $(REMOVECOMMAND) *.MAH
        @if exist *.err $(REMOVECOMMAND) *.err
+       @if exist TC*.SWP $(REMOVECOMMAND) TC*.SWP
 #      @if exist *.16W $(REMOVECOMMAND) *.16W
 #      @if exist *.16B $(REMOVECOMMAND) *.16B
 
@@ -396,9 +417,16 @@ www: .symbolic
 
 wwwext: .symbolic
        ####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'
+       #4ch.mooo.com
        @scp -r -P $(HOSTPORT) *.exe $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
        @scp -r -P $(HOSTPORT) *get.bat $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
        @scp -r -P $(HOSTPORT) /var/www/*.exe.zip.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+       @scp -r -P $(HOSTPORT) $(DATADIR)spri.zip $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+       #beta.latech.edu
+       @scp -r -P $(HOST2PORT) *.exe $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+       @scp -r -P $(HOST2PORT) *get.bat $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+       @scp -r -P $(HOST2PORT) /var/www/*.exe.zip.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+       @scp -r -P $(HOST2PORT) $(DATADIR)spri.zip $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
 
 getwww: .symbolic
        *x4get.bat $(EXEC)
@@ -411,12 +439,12 @@ vomitchan: .symbolic
 ##
 #git submodule add <repo>
 mkdl: .symbolic
-       @cd $(DOSLIB:$(to_os_path))
+       @cd $(DOSLIBDIR:$(to_os_path))
        @$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE)
        @cd $(BUILD_ROOT)
 
 cldl: .symbolic
-       @cd $(DOSLIB:$(to_os_path))
+       @cd $(DOSLIBDIR:$(to_os_path))
        @$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE) clean
        @cd $(BUILD_ROOT)
 
@@ -476,12 +504,12 @@ mx_: .symbolic
        @wmake -h -f makefile all
        @cd $(BUILD_ROOT)
 
+!ifdef __LINUX__
 vrs: .symbolic
+$(SPRIUTILEXEC):
        @cd $(DOSLIB_VGA:$(to_os_path))
        #@make clean
        @make all
-       @mv pcx2vrl $(BUILD_ROOT)$(DIRSEP)
-       @mv pcxsscut $(BUILD_ROOT)$(DIRSEP)
-       @mv vrl2vrs $(BUILD_ROOT)$(DIRSEP)
-       @mv vrsdump $(BUILD_ROOT)$(DIRSEP)
+       @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#$(DIRSEP)
        @cd $(BUILD_ROOT)
+!endif
wwww
About OSDN
Find Software
Develop Software
Help