summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIronClawTrem <louie.nutman@gmail.com>2020-01-24 19:23:59 +0000
committerIronClawTrem <louie.nutman@gmail.com>2020-01-24 19:23:59 +0000
commitbdaa5d9bd4738bda5ef5a88e504afe1b062e27d4 (patch)
tree9305af7edbf54c220f637f48f7e799718ae99056
parent7cf916bdb90e3aef61c3704a5792f6b6077ec3c7 (diff)
update and fix makefile
-rw-r--r--GNUmakefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 772a9de..bd8fb63 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -88,7 +88,7 @@ endif
export CROSS_COMPILING
ifndef VERSION
-VERSION=slackers
+VERSION=aa
endif
ifndef CLIENTBIN
@@ -1150,8 +1150,13 @@ $(B)/out/$(BASEGAME)_11/vm/ui.qvm: $(UIVMOBJ11) $(UIDIR)/ui_syscalls_11.asm $(Q3
## QVM Package
#############################################################################
-$(B)/out/$(BASEGAME)/vms-gpp1-$(VERSION).pk3: $(B)/out/$(BASEGAME)/vm/ui.qvm $(B)/out/$(BASEGAME)/vm/cgame.qvm $(B)/out/$(BASEGAME)/vm/game.qvm
- @(cd $(B)/out/$(BASEGAME) && zip -r vms-gpp1-$(VERSION).pk3 vm/)
+ifeq ($(BUILD_ONLY_CGUI),0)
+ $(B)/out/$(BASEGAME)/vms-gpp1-$(VERSION).pk3: $(B)/out/$(BASEGAME)/vm/ui.qvm $(B)/out/$(BASEGAME)/vm/cgame.qvm $(B)/out/$(BASEGAME)/vm/game.qvm
+ @(cd $(B)/out/$(BASEGAME) && zip -r vms-gpp1-$(VERSION).pk3 vm/)
+ else
+ $(B)/out/$(BASEGAME)/vms-gpp1-$(VERSION).pk3: $(B)/out/$(BASEGAME)/vm/ui.qvm $(B)/out/$(BASEGAME)/vm/cgame.qvm
+ @(cd $(B)/out/$(BASEGAME) && zip -r vms-gpp1-$(VERSION).pk3 vm/)
+endif
$(B)/out/$(BASEGAME)_11/vms-1.1.0-$(VERSION).pk3: $(B)/out/$(BASEGAME)_11/vm/ui.qvm $(B)/out/$(BASEGAME)_11/vm/cgame.qvm
@(cd $(B)/out/$(BASEGAME)_11 && zip -r vms-1.1.0-$(VERSION).pk3 vm/)