]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Mark dirty csprogs pk3 with ~, * is a reserved character on some filesystems
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 23 Mar 2016 22:16:17 +0000 (09:16 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 23 Mar 2016 22:16:17 +0000 (09:16 +1100)
qcsrc/Makefile
qcsrc/tools/compilationunits.sh

index 9b492efb41aec377fe2c8411a7f30ddfd462049e..ee335d9b0013817edf041d88082c9d8a8a9d2cea 100644 (file)
@@ -4,7 +4,7 @@ QCC ?= gmqcc
 PROGS_OUT ?= $(CURDIR)/..
 WORKDIR ?= ../.tmp
 
-QCCFLAGS_WATERMARK ?= $(shell git describe --tags --dirty='*')
+QCCFLAGS_WATERMARK ?= $(shell git describe --tags --dirty='~')
 VER = $(subst *,\*,$(QCCFLAGS_WATERMARK))
 NDEBUG ?= 1
 BUILD_MOD ?= 0
index 676c3f315a79d440c9f0e9e0aca14d73ead96df7..3c794e93fbba747b9eb43b6954a86a3c4a0856cf 100755 (executable)
@@ -9,7 +9,7 @@ CPP="cc -xc -E"
 
 declare -a QCCDEFS=(
     -DNDEBUG=1
-    -DWATERMARK="\"$(git describe --tags --dirty='*')\""
+    -DWATERMARK="\"$(git describe --tags --dirty='~')\""
     -DDEBUGPATHING=0
 )
 QCCDEFS="${QCCDEFS[@]}"