diff --git a/build/msvc/SLADE.rc b/build/msvc/SLADE.rc index 48031e749..2aaffd404 100644 --- a/build/msvc/SLADE.rc +++ b/build/msvc/SLADE.rc @@ -90,12 +90,12 @@ BEGIN BLOCK "0c0904b0" BEGIN VALUE "FileDescription", "SLADE" - VALUE "FileVersion", "3.1.2 Beta 1" + VALUE "FileVersion", "3.1.2 Beta 2" VALUE "InternalName", "SLADE.exe" VALUE "LegalCopyright", "Copyright (C) 2017" VALUE "OriginalFilename", "SLADE.exe" VALUE "ProductName", "SLADE" - VALUE "ProductVersion", "3.1.2 Beta 1" + VALUE "ProductVersion", "3.1.2 Beta 2" END END BLOCK "VarFileInfo" diff --git a/dist/makebuild.ps1 b/dist/makebuild.ps1 index 21856d4ea..8c2f8a7a2 100644 --- a/dist/makebuild.ps1 +++ b/dist/makebuild.ps1 @@ -1,5 +1,5 @@ -$version = "3120_b1" -$versionstring = "3.1.2 Beta 1" +$version = "3120_b2" +$versionstring = "3.1.2 Beta 2" # Check for 7-zip install $7zpath = "$env:ProgramFiles\7-Zip\7z.exe" diff --git a/src/Application/SLADEWxApp.cpp b/src/Application/SLADEWxApp.cpp index 1d1450bd4..e3d0d23fc 100644 --- a/src/Application/SLADEWxApp.cpp +++ b/src/Application/SLADEWxApp.cpp @@ -53,9 +53,9 @@ namespace Global { string error = ""; - int beta_num = 1; + int beta_num = 2; int version_num = 3120; - string version = "3.1.2 Beta 1"; + string version = "3.1.2 Beta 2"; #ifdef GIT_DESCRIPTION string sc_rev = GIT_DESCRIPTION; #else diff --git a/src/General/Log.cpp b/src/General/Log.cpp index 2a5a73c0a..aa5c176f4 100644 --- a/src/General/Log.cpp +++ b/src/General/Log.cpp @@ -96,12 +96,13 @@ void Log::init() info(S_FMT("Written by Simon Judd, 2008-%s", year)); #ifdef SFML_VERSION_MAJOR info(S_FMT( - "Compiled with wxWidgets %i.%i.%i and SFML %i.%i", + "Compiled with wxWidgets %i.%i.%i and SFML %i.%i.%i", wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER, SFML_VERSION_MAJOR, - SFML_VERSION_MINOR + SFML_VERSION_MINOR, + SFML_VERSION_PATCH )); #else info(S_FMT(