[iortcw] 01/152: All: Bump version to 1.42e

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.5a
in repository iortcw.

commit 38515275039eb415dd80029139d206bc88f79b5c
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat Dec 26 13:04:18 2015 -0500

    All: Bump version to 1.42e
---
 MP/Makefile                | 32 ++++++++++++++++----------------
 MP/code/qcommon/q_shared.h |  4 ++--
 SP/Makefile                | 30 +++++++++++++++---------------
 SP/code/qcommon/q_shared.h |  4 ++--
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index a921004..01b2ff6 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -132,7 +132,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.42d
+VERSION=1.42e
 endif
 
 ifndef CLIENTBIN
@@ -204,7 +204,7 @@ ifndef USE_CURL_DLOPEN
 endif
 
 ifndef USE_CODEC_VORBIS
-USE_CODEC_VORBIS=1
+USE_CODEC_VORBIS=0
 endif
 
 ifndef USE_CODEC_OPUS
@@ -264,7 +264,7 @@ DEBUG_CFLAGS=-g -O0
 endif
 
 ifndef USE_ANTIWALLHACK
-USE_ANTIWALLHACK=1
+USE_ANTIWALLHACK=0
 endif
 
 ifndef USE_BLOOM
@@ -345,14 +345,14 @@ ifneq ($(BUILD_CLIENT),0)
 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
+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
 
 
 #############################################################################
@@ -2731,11 +2731,11 @@ $(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/index
-#  $(B)/client/common.o : ../.git/index
-#  $(B)/ded/common.o : ../.git/index
-#endif
+ifeq ($(USE_GIT),1)
+  $(B)/client/cl_console.o : ../.git/index
+  $(B)/client/common.o : ../.git/index
+  $(B)/ded/common.o : ../.git/index
+endif
 
 
 #############################################################################
diff --git a/MP/code/qcommon/q_shared.h b/MP/code/qcommon/q_shared.h
index 3117a26..3bdd077 100644
--- a/MP/code/qcommon/q_shared.h
+++ b/MP/code/qcommon/q_shared.h
@@ -60,7 +60,7 @@ If you have questions concerning this license or the applicable additional terms
   #define BASEGAME			"main"
   #define CLIENT_WINDOW_TITLE     	"Return To Castle Wolfenstein"
   #define CLIENT_WINDOW_MIN_TITLE 	"iowolfmp"
-  #define HOMEPATH_NAME_UNIX		".wolf"
+  #define HOMEPATH_NAME_UNIX		".iortcw"
   #define HOMEPATH_NAME_WIN		"RTCW"
   #define STEAMPATH_NAME		"Return To Castle Wolfenstein"
   #define STEAMPATH_APPID		"9010"
@@ -79,7 +79,7 @@ If you have questions concerning this license or the applicable additional terms
 #define LEGACY_HEARTBEAT_FOR_MASTER	"Wolfenstein-1"
 
 #ifndef PRODUCT_VERSION
-  #define PRODUCT_VERSION "1.42d"
+  #define PRODUCT_VERSION "1.42e"
 #endif
 
 #ifndef OLD_PRODUCT_VERSION
diff --git a/SP/Makefile b/SP/Makefile
index f127b4f..94205e6 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -129,7 +129,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.42d
+VERSION=1.42e
 endif
 
 ifndef CLIENTBIN
@@ -201,7 +201,7 @@ ifndef USE_CURL_DLOPEN
 endif
 
 ifndef USE_CODEC_VORBIS
-USE_CODEC_VORBIS=1
+USE_CODEC_VORBIS=0
 endif
 
 ifndef USE_CODEC_OPUS
@@ -334,14 +334,14 @@ ifneq ($(BUILD_CLIENT),0)
 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
+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
 
 
 #############################################################################
@@ -2697,11 +2697,11 @@ $(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/index
-#  $(B)/client/common.o : ../.git/index
-#  $(B)/ded/common.o : ../.git/index
-#endif
+ifeq ($(USE_GIT),1)
+  $(B)/client/cl_console.o : ../.git/index
+  $(B)/client/common.o : ../.git/index
+  $(B)/ded/common.o : ../.git/index
+endif
 
 
 #############################################################################
diff --git a/SP/code/qcommon/q_shared.h b/SP/code/qcommon/q_shared.h
index a4a0fd1..8495a50 100644
--- a/SP/code/qcommon/q_shared.h
+++ b/SP/code/qcommon/q_shared.h
@@ -57,7 +57,7 @@ If you have questions concerning this license or the applicable additional terms
   #define BASEGAME			"main"
   #define CLIENT_WINDOW_TITLE     	"Return To Castle Wolfenstein"
   #define CLIENT_WINDOW_MIN_TITLE 	"iowolfsp"
-  #define HOMEPATH_NAME_UNIX		".wolf"
+  #define HOMEPATH_NAME_UNIX		".iortcw"
   #define HOMEPATH_NAME_WIN		"RTCW"
   #define STEAMPATH_NAME		"Return To Castle Wolfenstein"
   #define STEAMPATH_APPID		"9010"
@@ -76,7 +76,7 @@ If you have questions concerning this license or the applicable additional terms
 #define LEGACY_HEARTBEAT_FOR_MASTER	"Wolfenstein-1"
 
 #ifndef PRODUCT_VERSION
-  #define PRODUCT_VERSION "1.42d"
+  #define PRODUCT_VERSION "1.42e"
 #endif
 
 #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git