Commit c16f9b67 authored by dylan grafmyre's avatar dylan grafmyre
Browse files

fixup for recent makefile changes

parent f808f791
......@@ -25,3 +25,7 @@ addons/*.gma
addons/*/
*.bak
*.exe
*_hdr_final.vmf
*_fast.vmf
*_hdr.vmf
*_default.vmf
......@@ -56,7 +56,7 @@ MOUNT_FLAGS?=--mod-dir "'$(MOD_DIR)'"
%_p.bsp: %.bsp
$(BSPZIP_BIN) -addlist $^ $(^:.bsp=.bspzip-addlist) $@ $(BSPZIP_FLAGS)
cp $@ $(MOUNT_DIR)maps\\$(notdir $@)
cp $@ $(MOUNT_DIR)maps\\$(notdir $@) # ?
%.bspzip-addlist: %.vmf
$(GEN_BSPZIP_ADDLIST_BIN) $(GEN_BSPZIP_ADDLIST_FLAGS) $^ > $@
......@@ -83,7 +83,7 @@ endif
maps/%.bsp: %.bsp
ln $^ $@
ln -f $^ $@
# hammer default flags
%.bsp: %.vmf
......@@ -98,7 +98,7 @@ maps/%.bsp: %.bsp
$(BSP_BIN) $(VBIN_FLAGS) $(basename $^)
$(VIS_BIN) -fast $(VBIN_FLAGS) $(basename $^)
$(RAD_BIN) -bounce 2 -noextra $(VBIN_FLAGS) $(basename $^)
ln $(@:_fast.bsp=.vmf) $(@:_fast.bsp=_fast.vmf)
ln -f $(@:_fast.bsp=.vmf) $(@:_fast.bsp=_fast.vmf)
mv $(@:_fast.bsp=.bsp) $@
$(GEN_BSPZIP_ADDLIST_BIN) $(GEN_BSPZIP_ADDLIST_FLAGS) $^ > $(@:.bsp=.bspzip-addlist)
......@@ -107,7 +107,7 @@ maps/%.bsp: %.bsp
$(BSP_BIN) $(VBIN_FLAGS) $(basename $^)
$(VIS_BIN) $(VBIN_FLAGS) $(basename $^)
$(RAD_BIN) -both $(VBIN_FLAGS) $(basename $^)
ln $(@:_hdr.bsp=.vmf) $(@:_hdr.bsp=_hdr.vmf)
ln -f $(@:_hdr.bsp=.vmf) $(@:_hdr.bsp=_hdr.vmf)
mv $(@:_hdr.bsp=.bsp) $@
$(GEN_BSPZIP_ADDLIST_BIN) $(GEN_BSPZIP_ADDLIST_FLAGS) $^ > $(@:.bsp=.bspzip-addlist)
......@@ -116,7 +116,7 @@ maps/%.bsp: %.bsp
$(BSP_BIN) $(VBIN_FLAGS) $(basename $^)
$(VIS_BIN) $(VBIN_FLAGS) $(basename $^)
$(RAD_BIN) -both -final $(VBIN_FLAGS) $(basename $^)
ln $(@:_hdr_final.bsp=.vmf) $(@:_hdr_final.bsp=_hdr.vmf)
ln -f $(@:_hdr_final.bsp=.vmf) $(@:_hdr_final.bsp=_hdr.vmf)
mv $(@:_hdr_final.bsp=.bsp) $@
$(GEN_BSPZIP_ADDLIST_BIN) $(GEN_BSPZIP_ADDLIST_FLAGS) $^ > $(@:.bsp=.bspzip-addlist)
......@@ -219,9 +219,10 @@ publish: addons/ttt_terrorcon_v2_hdr_final.gma
all: lint maps/ttt_terrorcon_v2_hdr_final.bsp addons/ttt_terrorcon_v2_hdr_final.gma ttt_terrorcon_v2_hdr_final.game
fast: lint maps/ttt_terrorcon_v2_fast.bsp ttt_terrorcon_v2_fast.game
install-bsp: maps/ttt_terrorcon_v2_hdr_final.bsp maps/thumb/ttt_terrorcon_v2_hdr_final.png
cp -v $(word 1, $^) $(MOD_DIR)maps\\
cp -v $(word 2, $^) $(MOD_DIR)maps\\thumb\\
# use mount-dev instead
#install-bsp: maps/ttt_terrorcon_v2_hdr_final.bsp maps/thumb/ttt_terrorcon_v2_hdr_final.png
# cp -v $(word 1, $^) $(MOD_DIR)maps\\
# cp -v $(word 2, $^) $(MOD_DIR)maps\\thumb\\
# gmod dosn't allow mounting gma files
# so instead, i've got a parallel artifact being built that can be installed to garrysmod
......
SetKeyDelay, 3130
SetKeyDelay, 50 ; 20/sec
Sleep, 30000 ; 30 sec
Send, {``}
Sleep, 2000 ; 2 sec
Send, buildcubemaps{Enter}
Sleep, 30000 ; 30 sec
Send, quit{Enter}
Send, buildcubemaps{;}quit{Enter}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment