From bceeaf78bc4818f52bee49249b4fd2d94dc6578b Mon Sep 17 00:00:00 2001
From: Wolfy <wolfy852@hotmail.com>
Date: Sun, 12 Apr 2020 20:48:11 -0500
Subject: [PATCH] Prep stuff
pending asset hash changes
---
CMakeLists.txt | 2 +-
appveyor.yml | 4 ++--
src/doomdef.h | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7995034d3..a335fe591 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
# Version change is fine.
project(SRB2
- VERSION 1.1.0
+ VERSION 1.2.0
LANGUAGES C)
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
diff --git a/appveyor.yml b/appveyor.yml
index 3d46cf6de..f4cc4213c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.1.0.{branch}-{build}
+version: 1.2.0.{branch}-{build}
os: MinGW
environment:
@@ -29,7 +29,7 @@ environment:
##############################
DPL_ENABLED: 0
DPL_TAG_ENABLED: 0
- DPL_INSTALLER_NAME: srb2kart-v110
+ DPL_INSTALLER_NAME: srb2kart-v120
# Asset handling is barebones vs. Travis Deployer. We operate on 7z only.
# Include the README files and the OpenGL batch in the main and patch archives.
# The x86/x64 archives contain the DLL binaries.
diff --git a/src/doomdef.h b/src/doomdef.h
index bb9c37843..a40d969f0 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -149,10 +149,10 @@ extern FILE *logstream;
// most interface strings are ignored in development mode.
// we use comprevision and compbranch instead.
#else
-#define VERSION 110 // Game version
+#define VERSION 120 // Game version
#define SUBVERSION 0 // more precise version number
-#define VERSIONSTRING "v1.1"
-#define VERSIONSTRINGW L"v1.1"
+#define VERSIONSTRING "v1.2"
+#define VERSIONSTRINGW L"v1.2"
// Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
// And change CMakeLists.txt, for CMake users!
// AND appveyor.yml, for the build bots!
@@ -225,7 +225,7 @@ extern FILE *logstream;
// it's only for detection of the version the player is using so the MS can alert them of an update.
// Only set it higher, not lower, obviously.
// Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1".
-#define MODVERSION 5
+#define MODVERSION 6
// Filter consvars by version
// To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically.
--
GitLab