summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile26
1 files changed, 19 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 1c08824..7091542 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,15 @@
FS_BASEPATH ?= $(HOME)/tremulous
FS_HOMEBASE ?= .tremulous
+TREMULOUS ?= tremulous
Q3MAP ?= q3map2
Q3MAP_FLAGS += -fs_basepath $(FS_BASEPATH) -fs_homebase $(FS_HOMEBASE) \
-fs_game base -threads 4
-Q3MAP_BSP += -leaktest -meta
+Q3MAP_BSP += -leaktest -meta -custinfoparms
Q3MAP_VIS += -vis
Q3MAP_LIGHT += -light -bounce 1 -dirty -bouncegrid -dirtscale 0.3 \
- -dirtdepth 32 -fastbounce -patchshadows -samples 8 \
+ -dirtdepth 32 -fastbounce -patchshadows -samples 3 \
-samplesize 8 -cpma
FAST ?= 0
@@ -29,10 +30,14 @@ PARTS := maps/p0_master.map \
maps/p3_dretchpwner.map \
maps/p4_thepress.map \
maps/p5_euclid.map \
- maps/p6_engineering.map
+ maps/p6_engineering.map \
+ maps/p7_uncommon.map \
+ maps/p8_outside.map \
+ maps/p9_reactor.map
WHOLE := maps/analmango
-.DEFAULT_GOAL := $(WHOLE).bsp
+MAP ?= analmango
+.DEFAULT_GOAL := maps/$(MAP).bsp
-include Makefile.local
@@ -40,8 +45,15 @@ WHOLE := maps/analmango
# Creating a .pk3 with all the assets
#
-analmango.pk3: $(WHOLE).bsp
- zip -r9 $@ maps/analmango.bsp scripts sound textures models
+PK3 ?= analmango.pk3
+$(PK3): $(WHOLE).bsp
+ cat pk3.list | (while read ent; do echo $$ent; done) | xargs zip -r9 $(PK3)
+
+#
+# Testing a map
+#
+test: maps/$(MAP).bsp
+ $(TREMULOUS) +devmap $(MAP)
#
# Assembling the complete .map from parts
@@ -68,4 +80,4 @@ clean:
rm -f maps/*.bsp
rm -f $(WHOLE).*
-.PHONY: clean default
+.PHONY: clean test