ca_t added and vgacamm for sparky4

[16.git] / makefile

diff --git a/makefile b/makefile
index 95acd3bc918bcb9fcdb1d7685eefb7b5163a0775..d9a1228dd1a2c9c9e0eb75d6c69462b29b0b4dde 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -42,13 +42,17 @@ COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=obj
 DUMP=cat
+DOSLIBMAKE=make.sh
+DOSLIBMAKEALL=buildall.sh
 !else          #DOS ^^
 to_os_path=/=\
-REMOVECOMMAND=del
+REMOVECOMMAND=*del
 COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
+DOSLIBMAKE=make.bat
+DOSLIBMAKEALL=build.bat
 !endif
 
 TARGET_OS = dos
@@ -56,7 +60,7 @@ TARGET_OS = dos
 BUILD_ROOT=$+$(%__CWD__)$-
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
 DATADIR=data$(DIRSEP)
-SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP)
+SPRI=$(DATADIR)/spri
 SRC=src
 SRCLIB=src/lib
 JSMNLIB=src/lib/jsmn
@@ -95,7 +99,7 @@ CPPFLAGS += -DDEBUGSERIAL
 !endif
 AFLAGS=$(WCLQ) $(T_FLAGS)
 CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
-LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah -lr
+LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah $(S_FLAGS)
 LIBFLAGS=$(WLIBQ) -b -n
 
 #
@@ -141,7 +145,7 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 
 #CFLAGS is neccessary here
 .obj.exe :
-       *wcl $(CFLAGS) $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
+       *wcl $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
 
 .obj.lib :
        *wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
@@ -164,7 +168,8 @@ TESTEXEC = &
     inputest.exe &
     palettel.exe &
     exmmtest.exe &
-    vrstest.exe
+    vrstest.exe &
+    vgacamm.exe
 EXEC = &
     16.exe &
     bakapi.exe &
@@ -199,6 +204,7 @@ inputest.exe:     inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
 #sountest.exe:    sountest.$(OBJ) $(16LIB)
 pcxtest.exe:      pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS)
 vrstest.exe:      vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+vgacamm.exe:      vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
 palettec.exe:     palettec.$(OBJ) gfx.lib $(DOSLIBLIBS)
 palettel.exe:     palettel.$(OBJ) gfx.lib $(DOSLIBLIBS)
 pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS)
@@ -218,6 +224,7 @@ test.$(OBJ):      $(SRC)/test.c $(SRCLIB)/modex16.h
 test0.$(OBJ):     $(SRC)/test0.c
 pcxtest.$(OBJ):   $(SRC)/pcxtest.c $(SRCLIB)/modex16.h
 vrstest.$(OBJ):   $(SRC)/vrstest.c $(SRCLIB)/modex16.h
+vgacamm.$(OBJ):   $(SRC)/vgacamm.c $(SRCLIB)/modex16.h
 #planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/modex16.h
 pcxtest2.$(OBJ):  $(SRC)/pcxtest2.c $(SRCLIB)/modex16.h
 palettec.$(OBJ):  $(SRC)/palettec.c
@@ -247,28 +254,24 @@ vgmsnd.lib: $(VGMSNDOBJ)
 gfx.lib: $(GFXLIBOBJS)
        *wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
 
-# extdep:
-# !include $(DOSLIBDIR)$(DIRSEP)extdep.mak
-
+#
+#      doslib
+#
 # library deps 16-bit huge
 $(DOSLIB_CPU)/dos86h/cpu.lib:
-       cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+       cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_DOS)/dos86h/dos.lib:
-       cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+       cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/dos86h/vgatty.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/dos86h/vga.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
 $(DOSLIB_8250)/dos86h/8250.lib:
-       cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+       cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
 
 joytest.exe:
-       cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+       cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)$(DOSLIBMAKE) && cd $(BUILD_ROOT)
        $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)dos86h$(DIRSEP)test.exe joytest.exe
-#$(DOSLIBLIBS): .symbolic
-#      @cd $(DOSLIB:$(to_os_path))
-#      @.$(DIRSEP)buildall.sh
-#      @cd $(BUILD_ROOT)
 
 modex16.$(OBJ):   $(SRCLIB)/modex16.c $(SRCLIB)/modex16.h
 bakapee.$(OBJ):   $(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
@@ -306,8 +309,11 @@ clean: .symbolic
        @$(REMOVECOMMAND) *.$(OBJ)
 !ifdef __LINUX__
        @rm *.LIB
+       @. src/util/bcexmm.sh
        @rm *.EXE
        #@$(REMOVECOMMAND) *.\$\$\$
+       @$(REMOVECOMMAND) *.OBJ
+       @$(REMOVECOMMAND) *.BCO
 !else
        @*$(REMOVECOMMAND) *.$$$
 !endif
@@ -317,23 +323,15 @@ clean: .symbolic
        @*wlib -n $(WLIBQ) 16.lib
        @*wlib -n $(WLIBQ) gfx.lib
        @*wlib -n $(WLIBQ) vgmsnd.lib
-       @$(REMOVECOMMAND) *.16W
-       @$(REMOVECOMMAND) *.16B
-       @$(REMOVECOMMAND) *.OBJ
-       @$(REMOVECOMMAND) *.o
-       @$(REMOVECOMMAND) *.BCO
-       #@$(REMOVECOMMAND) makefi~1
-       #@$(REMOVECOMMAND) makefile~
+##     @$(REMOVECOMMAND) *.16W
+##     @$(REMOVECOMMAND) *.16B
        @$(REMOVECOMMAND) __wcl__.LNK
-#      @$(REMOVECOMMAND) *.smp
        @$(REMOVECOMMAND) *.SMP
        @$(REMOVECOMMAND) *.hed
        @$(REMOVECOMMAND) *.MAH
        @$(REMOVECOMMAND) *.mah
        @$(REMOVECOMMAND) *.err
-       #@cd $(DOSLIB:$(to_os_path))
-       #@./buildall.sh clean
-       #@cd $(BUILD_ROOT)
+
 #      @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #      @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #      @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -341,8 +339,12 @@ clean: .symbolic
 #      @$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #      @$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #      @$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
-#      @echo $(watcom)
-#      @echo $(INCLUDE)
+
+nuke: .symbolic
+       @wmake clean
+       @wmake cldl
+       @wmake all
+       @wmake comp
 
 backupconfig: .symbolic
        @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
@@ -377,7 +379,12 @@ vomitchan: .symbolic
 #git submodule add <repo>
 mkdl: .symbolic
        @cd $(DOSLIB:$(to_os_path))
-       @./buildall.sh
+       @$(DOSLIBMAKEALL)
+       @cd $(BUILD_ROOT)
+
+cldl: .symbolic
+       @cd $(DOSLIB:$(to_os_path))
+       @$(DOSLIBMAKEALL) clean
        @cd $(BUILD_ROOT)
 
 uplibs: .symbolic
@@ -389,8 +396,8 @@ uplibs: .symbolic
        @cd $(BUILD_ROOT)
 
 reinitlibs: .symbolic
-       @rm -rf $(SRCLIB)doslib
-       @rm -rf $(SRCLIB)jsmn
+       @rm -rf $(DOSLIB)
+       @rm -rf $(JSMNLIB)
        @rm -rf 16/CatacombApocalypse
        @rm -rf 16/wolf3d
        @rm -rf 16/keen