diff --git a/README.md b/README.md index 4f3d7011..b459ea06 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Proof of concept for an Modern Warfare Remastered client.
## 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\h1-mod.sln`. ### Premake arguments diff --git a/generate.bat b/generate.bat index b9ffdf6f..06c74119 100644 --- a/generate.bat +++ b/generate.bat @@ -1,3 +1,3 @@ @echo off git submodule update --init --recursive -tools\premake5 %* vs2019 \ No newline at end of file +tools\premake5 %* vs2022 \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index b3f026af..16043516 100644 --- a/premake5.lua +++ b/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" diff --git a/src/client/std_include.hpp b/src/client/std_include.hpp index a0d25e91..98a00a2d 100644 --- a/src/client/std_include.hpp +++ b/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) diff --git a/tools/premake5.exe b/tools/premake5.exe index 0e4954fd..c73da1fb 100644 Binary files a/tools/premake5.exe and b/tools/premake5.exe differ