polish wwww

[16.git] / makefile

diff --git a/makefile b/makefile
index d9a1228dd1a2c9c9e0eb75d6c69462b29b0b4dde..7c17104c1d79eb816d4448fd325787d83b661ac3 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -46,7 +46,7 @@ DOSLIBMAKE=make.sh
 DOSLIBMAKEALL=buildall.sh
 !else          #DOS ^^
 to_os_path=/=\
-REMOVECOMMAND=*del
+REMOVECOMMAND=del
 COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
@@ -107,7 +107,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) #scroll16.$(OBJ)
 #16planar.$(OBJ) planar.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
@@ -209,7 +209,7 @@ palettec.exe:     palettec.$(OBJ) gfx.lib $(DOSLIBLIBS)
 palettel.exe:     palettel.$(OBJ) gfx.lib $(DOSLIBLIBS)
 pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS)
 #planrpcx.exe:    planrpcx.$(OBJ) gfx.lib
-maptest.exe:      maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) gfx.lib $(DOSLIBLIBS)
+maptest.exe:      maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) jsmn.$(OBJ) gfx.lib $(DOSLIBLIBS)
 fmemtest.exe:     fmemtest.$(OBJ)
 exmmtest.exe:     exmmtest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
 vgmtest.exe:      vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIBLIBS)
@@ -284,6 +284,7 @@ planar.$(OBJ):    $(SRCLIB)/planar.c $(SRCLIB)/planar.h
 scroll16.$(OBJ):  $(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
 16text.$(OBJ):    $(SRCLIB)/16text.c
 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
@@ -305,32 +306,27 @@ modex.$(OBJ):     $(MODEXLIB)/modex.asm
 #other~
 #
 clean: .symbolic
-       @$(REMOVECOMMAND) $(EXEC)
-       @$(REMOVECOMMAND) *.$(OBJ)
+       @for %f in ($(EXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
        @rm *.LIB
        @. src/util/bcexmm.sh
        @rm *.EXE
-       #@$(REMOVECOMMAND) *.\$\$\$
-       @$(REMOVECOMMAND) *.OBJ
-       @$(REMOVECOMMAND) *.BCO
-!else
-       @*$(REMOVECOMMAND) *.$$$
 !endif
-       @$(REMOVECOMMAND) 16.lib
-       @$(REMOVECOMMAND) gfx.lib
-       @$(REMOVECOMMAND) vgmsnd.lib
-       @*wlib -n $(WLIBQ) 16.lib
-       @*wlib -n $(WLIBQ) gfx.lib
-       @*wlib -n $(WLIBQ) vgmsnd.lib
-##     @$(REMOVECOMMAND) *.16W
-##     @$(REMOVECOMMAND) *.16B
-       @$(REMOVECOMMAND) __wcl__.LNK
-       @$(REMOVECOMMAND) *.SMP
-       @$(REMOVECOMMAND) *.hed
-       @$(REMOVECOMMAND) *.MAH
-       @$(REMOVECOMMAND) *.mah
-       @$(REMOVECOMMAND) *.err
+       @if exist *.obj $(REMOVECOMMAND) *.obj
+       @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
+       @if exist *.bco $(REMOVECOMMAND) *.bco
+       @if exist *.BCO $(REMOVECOMMAND) *.BCO
+       @if exist *.LIB $(REMOVECOMMAND) *.LIB
+       @if exist *.lnk $(REMOVECOMMAND) *.lnk
+       @if exist *.LNK $(REMOVECOMMAND) *.LNK
+       @if exist *.smp $(REMOVECOMMAND) *.smp
+       @if exist *.SMP $(REMOVECOMMAND) *.SMP
+       @if exist *.hed $(REMOVECOMMAND) *.hed
+       @if exist *.mah $(REMOVECOMMAND) *.mah
+       @if exist *.MAH $(REMOVECOMMAND) *.MAH
+       @if exist *.err $(REMOVECOMMAND) *.err
+#      @if exist *.16W $(REMOVECOMMAND) *.16W
+#      @if exist *.16B $(REMOVECOMMAND) *.16B
 
 #      @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #      @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
@@ -415,6 +411,7 @@ initlibs: .symbolic
        @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
        @git clone https://github.com/id-Software/wolf3d.git
        @git clone https://github.com/keendreams/keen.git
+       @git clone https://github.com/FlatRockSoft/Catacomb3D.git
        @cd $(BUILD_ROOT)
        @cp $(DOSLIB)/make-lowercase .