Update Windows Compilation to use Visual Studio 2022

.github/workflows/compile_windows.yml

@@ -9,27 +9,27 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4.1.7
 
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1
+      uses: microsoft/setup-msbuild@v2
 
     - name: Setup Nuget
-      uses: nuget/setup-nuget@v1
+      uses: nuget/setup-nuget@v2.0.0
 
     - name: Restore Nuget packages
-      run: nuget restore Source\visual_studio_2019\Pikifen.sln
+      run: nuget restore Source\visual_studio_2022\Pikifen.sln
 
     - name: Build app for release
-      run: msbuild Source\visual_studio_2019\Pikifen.vcxproj -t:rebuild -verbosity:n -property:Configuration=Release -property:Platform=x64
+      run: msbuild Source\visual_studio_2022\Pikifen.vcxproj -t:rebuild -verbosity:n -property:Configuration=Release -property:Platform=x64
 
     - name: Copy Files to build directory
       run: |
         new-item ${{ github.workspace }}\build -itemtype directory
-        copy-item -Path ${{ github.workspace }}\Source\visual_studio_2019\x64\Release\Pikifen.exe -Destination ${{ github.workspace }}\build -PassThru
+        copy-item -Path ${{ github.workspace }}\Source\visual_studio_2022\x64\Release\Pikifen.exe -Destination ${{ github.workspace }}\build -PassThru
 
     - name: Publish artifact
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4.3.4
       with:
         name: Pikifen
         path: ${{ github.workspace }}\build\

.gitignore

@@ -1,11 +1,8 @@
-Source/visual_studio_2013/Debug/
-Source/visual_studio_2013/Release/
-Source/visual_studio_2013/Pikifen.v12.suo
-Source/visual_studio_2019/.vs/
-Source/visual_studio_2019/packages/
-Source/visual_studio_2019/Win32/
-Source/visual_studio_2019/x64/
-Source/visual_studio_2019/Pikifen.vcxproj.user
+Source/visual_studio_2022/.vs/
+Source/visual_studio_2022/packages/
+Source/visual_studio_2022/Win32/
+Source/visual_studio_2022/x64/
+Source/visual_studio_2022/Pikifen.vcxproj.user
 Source/codelite/Debug/
 Source/codelite/Release/
 Source/codelite/.codelite/

Source/source/controls.cpp

@@ -9,7 +9,6 @@
  */
 
 #include <algorithm>
-#include <iostream>
 #include <typeinfo>
 
 #include <allegro5/allegro.h>

Source/source/functions.cpp

@@ -9,6 +9,7 @@
  */
 
 #define _USE_MATH_DEFINES
+#undef _CMATH_
 
 // Visual Studio warnings.
 #ifdef _MSC_VER
@@ -18,11 +19,7 @@
 
 #include <algorithm>
 #include <iostream>
-#include <math.h>
-#include <signal.h>
-#include <sstream>
 #include <stdlib.h>
-#include <typeinfo>
 
 #include <allegro5/allegro.h>
 #include <allegro5/allegro_primitives.h>
@@ -32,7 +29,6 @@
 #include "const.h"
 #include "drawing.h"
 #include "game.h"
-#include "game_states/menus.h"
 #include "init.h"
 #include "utils/allegro_utils.h"
 #include "utils/backtrace.h"

Source/source/libs/data_file.cpp

@@ -1,4 +1,6 @@
 //Read data_file.h for more info.
+
+#undef _CMATH_
 #include <fstream>
 
 #include <allegro5/allegro.h>

Source/source/misc_structs.cpp

@@ -9,6 +9,8 @@
  * to warrant their own files.
  */
 
+#undef _CMATH_
+
 #include <algorithm>
 #include <climits>
 #include <iostream>

Source/source/mob_script.cpp

@@ -9,10 +9,7 @@
  * related functions.
  */
 
-//#define DEBUG_FSM
-
 #include <algorithm>
-#include <iostream>
 
 #include "mob_script.h"
 

Source/source/utils/math_utils.cpp

@@ -11,7 +11,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <math.h>
 
 #include "math_utils.h"
 

Source/source/utils/string_utils.cpp

@@ -9,6 +9,8 @@
  * These don't contain logic specific to the Pikifen project.
  */
 
+#undef _CMATH_
+
 #include <algorithm>
 #include <assert.h>
 #include <cstdlib>

Source/visual_studio_2019/Pikifen.sln → Source/visual_studio_2022/Pikifen.sln

@@ -1,31 +1,31 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pikifen", "Pikifen.vcxproj", "{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x64.ActiveCfg = Debug|x64
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x64.Build.0 = Debug|x64
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x86.ActiveCfg = Debug|Win32
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x86.Build.0 = Debug|Win32
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x64.ActiveCfg = Release|x64
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x64.Build.0 = Release|x64
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x86.ActiveCfg = Release|Win32
-		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DBEF664C-90B9-49FF-934B-821262A705BC}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29009.5
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pikifen", "Pikifen.vcxproj", "{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x64.ActiveCfg = Debug|x64
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x64.Build.0 = Debug|x64
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x86.ActiveCfg = Debug|Win32
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Debug|x86.Build.0 = Debug|Win32
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x64.ActiveCfg = Release|x64
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x64.Build.0 = Release|x64
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x86.ActiveCfg = Release|Win32
+		{6DB9D4DA-ECDF-4E8A-88D6-510A6F51FCCD}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DBEF664C-90B9-49FF-934B-821262A705BC}
+	EndGlobalSection
+EndGlobal