Merge pull request #307 from mjkzy/warnings

disable deprecated array type warnings (vs2022 premake upgrade)

.github/workflows/build.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     name: Build binaries
-    runs-on: windows-latest
+    runs-on: windows-2022
     strategy:
       matrix:
         configuration:
@@ -35,11 +35,11 @@ jobs:
           lfs: false
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.1
 
       - name: Generate project files
-        #run: tools/premake5 vs2019 --ci-build
-        run: tools/premake5 vs2019
+        #run: tools/premake5 vs2022 --ci-build
+        run: tools/premake5 vs2022
 
       - name: Set up problem matching
         uses: ammaraskar/msvc-problem-matcher@master

README.md

@@ -16,7 +16,7 @@
 ## Compile from source
 
 - Clone the Git repo. Do NOT download it as ZIP, that won't work.
-- Update the submodules and run `premake5 vs2019` or simply use the delivered `generate.bat`.
+- Update the submodules and run `premake5 vs2022` or simply use the delivered `generate.bat`.
 - Build via solution file in `build\s1x.sln`.
 
 ### Premake arguments

generate.bat

@@ -1,3 +1,3 @@
 @echo off
 git submodule update --init --recursive
-tools\premake5 %* vs2019
+tools\premake5 %* vs2022

premake5.lua

@@ -227,10 +227,12 @@ targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}"
 
 configurations {"Debug", "Release"}
 
-architecture "x64"
+language "C++"
+cppdialect "C++20"
+
+architecture "x86_64"
 platforms "x64"
 
-buildoptions "/std:c++latest"
 systemversion "latest"
 symbols "On"
 staticruntime "On"
@@ -248,25 +250,22 @@ end
 
 flags {"NoIncrementalLink", "NoMinimalRebuild", "MultiProcessorCompile", "No64BitChecks"}
 
+filter "platforms:x64"
+	defines {"_WINDOWS", "WIN32"}
+filter {}
 
-configuration "windows"
-defines {"_WINDOWS", "WIN32"}
+filter "configurations:Release"
+	optimize "Size"
+	buildoptions {"/GL"}
+	linkoptions { "/IGNORE:4702", "/LTCG" }
+	defines {"NDEBUG"}
+	flags {"FatalCompileWarnings"}
+filter {}
 
-configuration "Release"
-optimize "Size"
-buildoptions {"/GL"}
-linkoptions { "/IGNORE:4702", "/LTCG" }
-
-defines {"NDEBUG"}
-
-flags {"FatalCompileWarnings"}
-
-configuration "Debug"
-optimize "Debug"
-
-defines {"DEBUG", "_DEBUG"}
-
-configuration {}
+filter "configurations:Debug"
+	optimize "Debug"
+	defines {"DEBUG", "_DEBUG"}
+filter {}
 
 project "common"
 kind "StaticLib"

src/client/std_include.hpp

@@ -10,6 +10,7 @@
 #pragma warning(disable: 4702)
 #pragma warning(disable: 4996)
 #pragma warning(disable: 5054)
+#pragma warning(disable: 5056)
 #pragma warning(disable: 6011)
 #pragma warning(disable: 6297)
 #pragma warning(disable: 6385)