** This will be reverted after tag is made. (ignore buildbot errors w…

…hen this is made)

Bump version numbers for a 3.1.5 release.
disable debug.

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[3.1git],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.1.5],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])
 
@@ -257,7 +257,7 @@ AS_IF([test "x$enable_sound" != "xyes"],[
 # Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
 AC_ARG_ENABLE([debug],
 	AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
-	[ enable_debug=${enableval} ], [ enable_debug=yes ])
+	[ enable_debug=${enableval} ], [ enable_debug=no ])
 AC_MSG_CHECKING([whether to compile in debug mode])
 AC_MSG_RESULT([${enable_debug}])
 

lib/framework/frame.h

@@ -73,7 +73,7 @@ typedef uint16_t PlayerMask;
 #endif
 // **********************************
 // We need to update this on releases
-#define WZ_GAME_VERSION "3.1.4"
+#define WZ_GAME_VERSION "3.1.5"
 // **********************************
 enum QUEUE_MODE
 {

lib/netplay/netplay.cpp

@@ -172,8 +172,8 @@ unsigned NET_PlayerConnectionStatus[CONNECTIONSTATUS_NORMAL][MAX_PLAYERS];
  ************************************************************************************
 **/
 static char const *versionString = version_getVersionString();
-static int NETCODE_VERSION_MAJOR = 0x2000;
-static int NETCODE_VERSION_MINOR = 0;
+static int NETCODE_VERSION_MAJOR = 0x20A0;
+static int NETCODE_VERSION_MINOR = 0x29;
 
 bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor)
 {

win32/warzone2100.rc

@@ -4,8 +4,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 3,1,0,0
- PRODUCTVERSION 3,1,0,0
+ FILEVERSION 3,1,5,0
+ PRODUCTVERSION 3,1,5,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "Warzone 2100 Project"
 			VALUE "FileDescription", "Warzone 2100"
-			VALUE "FileVersion", "3.1git"
+			VALUE "FileVersion", "3.1.5"
 			VALUE "InternalName", "Warzone 2100"
-			VALUE "LegalCopyright", "Copyright (C) 2005-2015 Warzone 2100 Project"
+			VALUE "LegalCopyright", "Copyright (C) 2005-2016 Warzone 2100 Project"
 			VALUE "OriginalFilename", "warzone2100.exe"
 			VALUE "ProductName", "Warzone 2100"
-			VALUE "ProductVersion", "3.1git"
+			VALUE "ProductVersion", "3.1.5"
 		END
 	END
 	BLOCK "VarFileInfo"

win32/warzone2100_portable.rc

@@ -4,8 +4,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 9,9,9,9
- PRODUCTVERSION 9,9,9,9
+ FILEVERSION 3,1,5,0
+ PRODUCTVERSION 3,1,5,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "Warzone 2100 Project"
 			VALUE "FileDescription", "Warzone 2100 portable"
-			VALUE "FileVersion", "3.1git"
+			VALUE "FileVersion", "3.1.5"
 			VALUE "InternalName", "Warzone 2100"
-			VALUE "LegalCopyright", "Copyright (C) 2005-2015 Warzone 2100 Project"
+			VALUE "LegalCopyright", "Copyright (C) 2005-2016 Warzone 2100 Project"
 			VALUE "OriginalFilename", "warzone2100_portable.exe"
 			VALUE "ProductName", "Warzone 2100 portable"
-			VALUE "ProductVersion", "3.1git"
+			VALUE "ProductVersion", "3.1.5"
 		END
 	END
 	BLOCK "VarFileInfo"