Bump version to 3.2.0

sirjuddington · Apr 12, 2022 · 68e0a69 · 68e0a69
1 parent ba2ce28
commit 68e0a69
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/Info.plist b/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.13</string>
+	<string>3.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>SLA3</string>
 	<key>NSPrincipalClass</key>
@@ -29,7 +29,7 @@
 	<key>NSRequiresAquaSystemAppearance</key>
 	<false/>
 	<key>CFBundleVersion</key>
-	<string>3.1.13</string>
+	<string>3.2.0</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>

diff --git a/dist/makebuild.ps1 b/dist/makebuild.ps1
@@ -1,4 +1,4 @@
-$version = "3.2.0_b4"
+$version = "3.2.0"
 $rev_short = Invoke-Expression "git.exe rev-parse --short HEAD"
 
 # Check for 7-zip install

diff --git a/msvc/SLADE.rc b/msvc/SLADE.rc
@@ -68,12 +68,12 @@ BEGIN
         BLOCK "0c0904b0"
         BEGIN
             VALUE "FileDescription", "SLADE"
-            VALUE "FileVersion", "3.2.0 Beta 4"
+            VALUE "FileVersion", "3.2.0"
             VALUE "InternalName", "SLADE.exe"
             VALUE "LegalCopyright", "Copyright (C) 2022"
             VALUE "OriginalFilename", "SLADE.exe"
             VALUE "ProductName", "SLADE"
-            VALUE "ProductVersion", "3.2.0 Beta 4"
+            VALUE "ProductVersion", "3.2.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/msvc/SLADE.vcxproj b/msvc/SLADE.vcxproj
@@ -79,12 +79,12 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath)</IncludePath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath)</IncludePath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SLADE-dbg</TargetName>
@@ -973,4 +973,4 @@
     <ResourceCompile Include="SLADE.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
diff --git a/net.mancubus.SLADE.metainfo.xml b/net.mancubus.SLADE.metainfo.xml
@@ -58,6 +58,7 @@
 		</screenshot>
 	</screenshots>
 	<releases>
+		<release date="2022-04-12" version="3.2.0"/>
 		<release date="2021-06-01" version="3.1.13"/>
 		<release date="2020-05-26" version="3.1.12"/>
 		<release date="2020-03-03" version="3.1.11"/>

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

diff --git a/win_installer/SLADE.iss b/win_installer/SLADE.iss
@@ -3,7 +3,7 @@
 
 #define MyAppName "SLADE"
 #define MyAppVersion "3.2.0"
-#define MyAppURL "http://slade.mancubus.net"
+#define MyAppURL "https://slade.mancubus.net"
 #define MyAppExeName "SLADE.exe"
 
 ; TODO:
@@ -25,13 +25,12 @@ DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 ;InfoBeforeFile=..\dist\SLADE.html
 OutputBaseFilename=Setup_{#MyAppName}_{#MyAppVersion}
-SetupIconFile=..\build\msvc\slade.ico
+SetupIconFile=..\msvc\slade.ico
 Compression=lzma
 SolidCompression=yes
 
 [Languages]
 Name: "en"; MessagesFile: "compiler:Default.isl"
-;Name: "de"; MessagesFile: "compiler:Languages\German.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
@@ -69,7 +68,7 @@ begin
 	initwinversion();
 
   // Check for VS2015 runtimes installed
-  vcredist2015();
+  //vcredist2015();
 
   Result := true;
 end;