From 02374c9ac07817837d0e88da7a1219969815302f Mon Sep 17 00:00:00 2001 From: MAN-AT-ARMS Date: Wed, 23 Aug 2017 16:45:18 -0400 Subject: [PATCH] 1.0.2 Release --- Makefile | 17 ----------------- code/qcommon/files.c | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Makefile b/Makefile index ef9457e7..0b104464 100644 --- a/Makefile +++ b/Makefile @@ -362,16 +362,6 @@ ifneq ($(BUILD_CLIENT),0) endif endif -# Add git version info -USE_GIT= -ifeq ($(wildcard .git),.git) - GIT_REV=$(shell git show -s --pretty=format:%h-%ad --date=short) - ifneq ($(GIT_REV),) - VERSION:=$(VERSION)_GIT_$(GIT_REV) - USE_GIT=1 - endif -endif - ############################################################################# # SETUP AND BUILD -- LINUX @@ -2739,13 +2729,6 @@ $(B)/ded/%.o: $(SYSDIR)/%.rc $(B)/ded/%.o: $(NDIR)/%.c $(DO_DED_CC) -# Extra dependencies to ensure the git version is incorporated -ifeq ($(USE_GIT),1) - $(B)/client/cl_console.o : .git - $(B)/client/common.o : .git - $(B)/ded/common.o : .git -endif - ############################################################################# ## GAME MODULE RULES diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 58194eb9..34d6b332 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -234,7 +234,7 @@ static const unsigned int sp_sppak_checksums[] = { }; static const unsigned int binpak_checksums[] = { - 3339940617u, // bin.pk3 (1.0.1) + 4066983521u, // bin.pk3 (1.0.2) }; #endif