From: TimePath Date: Wed, 23 Mar 2016 22:16:17 +0000 (+1100) Subject: Mark dirty csprogs pk3 with ~, * is a reserved character on some filesystems X-Git-Tag: xonotic-v0.8.2~1034 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34a18150e22d4ca146bf6d9464e803cb27790dac;p=xonotic%2Fxonotic-data.pk3dir.git Mark dirty csprogs pk3 with ~, * is a reserved character on some filesystems --- diff --git a/qcsrc/Makefile b/qcsrc/Makefile index 9b492efb4..ee335d9b0 100644 --- a/qcsrc/Makefile +++ b/qcsrc/Makefile @@ -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 diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh index 676c3f315..3c794e93f 100755 --- a/qcsrc/tools/compilationunits.sh +++ b/qcsrc/tools/compilationunits.sh @@ -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[@]}"