Bump version to 3.1.8

sirjuddington · Nov 21, 2019 · 6750977 · 6750977
1 parent 8b4f0e1
commit 6750977
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/build/msvc/SLADE.rc b/build/msvc/SLADE.rc
@@ -73,8 +73,8 @@ WXCURSOR_PENCIL         CURSOR  DISCARDABLE     "wx/msw/pencil.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,7
- PRODUCTVERSION 3,1,7
+ FILEVERSION 3,1,8
+ PRODUCTVERSION 3,1,8
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -90,12 +90,12 @@ BEGIN
         BLOCK "0c0904b0"
         BEGIN
             VALUE "FileDescription", "SLADE"
-            VALUE "FileVersion", "3.1.7"
+            VALUE "FileVersion", "3.1.8"
             VALUE "InternalName", "SLADE.exe"
             VALUE "LegalCopyright", "Copyright (C) 2019"
             VALUE "OriginalFilename", "SLADE.exe"
             VALUE "ProductName", "SLADE"
-            VALUE "ProductVersion", "3.1.7"
+            VALUE "ProductVersion", "3.1.8"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/dist/makebuild.ps1 b/dist/makebuild.ps1
@@ -1,4 +1,4 @@
-$version = "3.1.7"
+$version = "3.1.8"
 $rev_short = Invoke-Expression "git.exe rev-parse --short HEAD"
 
 # Check for 7-zip install
@@ -68,12 +68,10 @@ Copy-Item (resolve-path ".\slade.pk3") "$releasedir" -Force
 # Win32
 Copy-Item (resolve-path ".\SLADE.exe")               "$releasedir32" -Force
 Copy-Item (resolve-path ".\SLADE.pdb")               "$releasedir32" -Force
-Copy-Item (resolve-path ".\dll32\FreeImage.dll")     "$releasedir32" -Force
 Copy-Item (resolve-path ".\dll32\libfluidsynth.dll") "$releasedir32" -Force
 # x64
 Copy-Item (resolve-path ".\SLADE-x64.exe")       "$releasedir64\SLADE.exe" -Force
 Copy-Item (resolve-path ".\SLADE-x64.pdb")       "$releasedir64\SLADE.pdb" -Force
-Copy-Item (resolve-path ".\dll64\FreeImage.dll") "$releasedir64" -Force
 # WinXP
 Copy-Item (resolve-path ".\WinXP\SLADE.exe")         "$releasedirxp" -Force
 Copy-Item (resolve-path ".\WinXP\SLADE.pdb")         "$releasedirxp" -Force
@@ -99,7 +97,6 @@ if ($buildbinaries.ToLower() -eq "y")
 
 	Write-Host "`nBuiling win32 binaries 7z..." -foregroundcolor yellow
 	& $7zpath a -t7z "$releasedir\slade_${version}${timestamp}.7z" `
-	"$releasedir32\FreeImage.dll" `
 	"$releasedir32\libfluidsynth.dll" `
 	"$releasedir32\SLADE.exe" `
 	"$releasedir32\SLADE.pdb" `
@@ -108,7 +105,6 @@ if ($buildbinaries.ToLower() -eq "y")
 
 	Write-Host "`nBuiling x64 binaries 7z..." -foregroundcolor yellow
 	& $7zpath a -t7z "$releasedir\slade_${version}_x64${timestamp}.7z" `
-	"$releasedir64\FreeImage.dll" `
 	"$releasedir64\SLADE.exe" `
 	"$releasedir64\SLADE.pdb" `
 	"$releasedir\slade.pk3"

diff --git a/net.mancubus.SLADE.appdata.xml b/net.mancubus.SLADE.appdata.xml
@@ -58,6 +58,7 @@
 		</screenshot>
 	</screenshots>
 	<releases>
+		<release date="2019-11-21" version="3.1.8"/>
 		<release date="2019-10-07" version="3.1.7"/>
 		<release date="2019-08-22" version="3.1.6"/>
 		<release date="2019-05-17" version="3.1.5"/>

diff --git a/src/Application/App.cpp b/src/Application/App.cpp
@@ -71,7 +71,7 @@ bool            exiting         = false;
 std::thread::id main_thread_id;
 
 // Version
-Version version_num{ 3, 1, 7, 0 };
+Version version_num{ 3, 1, 8, 0 };
 
 // Directory paths
 string dir_data = "";

diff --git a/win_installer/SLADE.iss b/win_installer/SLADE.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "SLADE"
-#define MyAppVersion "3.1.7"
+#define MyAppVersion "3.1.8"
 #define MyAppURL "http://slade.mancubus.net"
 #define MyAppExeName "SLADE.exe"
 
@@ -39,9 +39,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 
 [Files]
 Source: "..\dist\SLADE.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\dist\FreeImage.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\libfluidsynth.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\dist\openal32.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\slade.pk3"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\dist\SLADE.pdb"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files