From c1c0bccc44f447da8c64c74f8ff5a28865a6a87a Mon Sep 17 00:00:00 2001
From: Jeremy <53489032+clang-clang-clang@users.noreply.github.com>
Date: Wed, 5 Aug 2026 14:35:28 +0800
Subject: [PATCH] Windows: improve larger memory address and path handling also
 build in parallel

---
 .../ALmixer.Library/ALmixer.Library.Win32.vcxproj  |  1 +
 .../Box2D.Library/Box2D.Library.Win32.vcxproj      |  1 +
 .../Corona.AppTemplate.Win32.vcxproj               |  9 +++++++++
 .../Corona.Archiver/Corona.Archiver.vcxproj        | 13 +++++++++++++
 .../Corona.Debugger/Corona.Debugger.vcxproj        | 13 +++++++++++++
 .../Corona.LiveServer/Corona.LiveServer.vcxproj    | 14 ++++++++++++++
 .../Corona.Native.Library.Win32.vcxproj            |  2 ++
 .../Corona.OutputViewer.vcxproj                    | 12 ++++++++++++
 .../Corona.Rtt.Library.Win32.vcxproj               |  1 +
 platform/windows/Corona.Shell/Corona.Shell.vcxproj |  9 +++++++++
 .../Corona.Simulator.Native.Library.Win32.vcxproj  |  1 +
 .../Corona.Simulator/Corona.Simulator.vcxproj      | 13 +++++++++++++
 .../windows/CoronaBuilder/CoronaBuilder.vcxproj    |  9 +++++++++
 .../CryptoPP.Library.Win32.vcxproj                 |  1 +
 .../Glew.Library.Win32/Glew.Library.Win32.vcxproj  |  1 +
 .../LPeg.Library/LPeg.Library.Win32.vcxproj        |  1 +
 platform/windows/Lua.Compiler/Lua.Compiler.vcxproj | 13 +++++++++++++
 platform/windows/Lua.Console/Lua.Console.vcxproj   | 13 +++++++++++++
 .../windows/Lua.Library/Lua.Library.Win32.vcxproj  |  1 +
 .../Lua.Socket.Library.Win32.vcxproj               |  1 +
 .../Ogg.Vorbis.Library.Win32.vcxproj               |  1 +
 .../OpenAL.Library.Win32.vcxproj                   |  1 +
 .../Pthreads.Library.Win32.vcxproj                 |  1 +
 .../SQLite.Library/SQLite.Library.Win32.vcxproj    |  1 +
 platform/windows/Solar2DManifest.xml               | 10 ++++++++++
 .../luafilesystem/luafilesystem_dll.vcxproj        |  4 +++-
 26 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 platform/windows/Solar2DManifest.xml

diff --git a/platform/windows/ALmixer.Library/ALmixer.Library.Win32.vcxproj b/platform/windows/ALmixer.Library/ALmixer.Library.Win32.vcxproj
index ece36d41c..c508fca9d 100644
--- a/platform/windows/ALmixer.Library/ALmixer.Library.Win32.vcxproj
+++ b/platform/windows/ALmixer.Library/ALmixer.Library.Win32.vcxproj
@@ -90,6 +90,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/Box2D.Library/Box2D.Library.Win32.vcxproj b/platform/windows/Box2D.Library/Box2D.Library.Win32.vcxproj
index fbcaff754..26c7cb9e2 100644
--- a/platform/windows/Box2D.Library/Box2D.Library.Win32.vcxproj
+++ b/platform/windows/Box2D.Library/Box2D.Library.Win32.vcxproj
@@ -201,6 +201,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
diff --git a/platform/windows/Corona.AppTemplate.Win32/Corona.AppTemplate.Win32.vcxproj b/platform/windows/Corona.AppTemplate.Win32/Corona.AppTemplate.Win32.vcxproj
index 231a0473c..4d61ebf4f 100644
--- a/platform/windows/Corona.AppTemplate.Win32/Corona.AppTemplate.Win32.vcxproj
+++ b/platform/windows/Corona.AppTemplate.Win32/Corona.AppTemplate.Win32.vcxproj
@@ -60,7 +60,11 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -70,13 +74,18 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Corona.Shell\Main.cpp" />
diff --git a/platform/windows/Corona.Archiver/Corona.Archiver.vcxproj b/platform/windows/Corona.Archiver/Corona.Archiver.vcxproj
index 94ee0b60a..43e79d36c 100644
--- a/platform/windows/Corona.Archiver/Corona.Archiver.vcxproj
+++ b/platform/windows/Corona.Archiver/Corona.Archiver.vcxproj
@@ -121,6 +121,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -128,6 +129,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -139,6 +143,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PreprocessorDefinitions>Rtt_WIN_ENV;Rtt_WIN_DESKTOP_ENV;Rtt_NO_ARCHIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -146,6 +151,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -153,6 +159,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
     <ClCompile>
@@ -173,6 +182,7 @@
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -180,6 +190,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/platform/windows/Corona.Debugger/Corona.Debugger.vcxproj b/platform/windows/Corona.Debugger/Corona.Debugger.vcxproj
index bdd86e028..deda3de75 100644
--- a/platform/windows/Corona.Debugger/Corona.Debugger.vcxproj
+++ b/platform/windows/Corona.Debugger/Corona.Debugger.vcxproj
@@ -118,6 +118,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -125,6 +126,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -136,6 +140,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_CONSOLE;_LIB;Rtt_WIN_ENV;Rtt_WIN_DESKTOP_ENV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\librtt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -143,6 +148,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -150,6 +156,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
     <ClCompile>
@@ -170,6 +179,7 @@
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <OptimizeReferences>false</OptimizeReferences>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -177,6 +187,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/platform/windows/Corona.LiveServer/Corona.LiveServer.vcxproj b/platform/windows/Corona.LiveServer/Corona.LiveServer.vcxproj
index 1d8384e2b..b72a87b95 100644
--- a/platform/windows/Corona.LiveServer/Corona.LiveServer.vcxproj
+++ b/platform/windows/Corona.LiveServer/Corona.LiveServer.vcxproj
@@ -77,6 +77,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS ;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\external\live-libs\win32\2019\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -86,6 +87,7 @@
       </IgnoreSpecificDefaultLibraries>
       <AdditionalDependencies>
       </AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -97,6 +99,9 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -108,6 +113,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS ;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\external\live-libs\win32\2019\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -119,6 +125,7 @@
       </IgnoreSpecificDefaultLibraries>
       <AdditionalDependencies>
       </AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -136,6 +143,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
     <ClCompile>
@@ -160,6 +170,7 @@
       </IgnoreSpecificDefaultLibraries>
       <AdditionalDependencies>
       </AdditionalDependencies>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -177,6 +188,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />
diff --git a/platform/windows/Corona.Native.Library.Win32/Corona.Native.Library.Win32.vcxproj b/platform/windows/Corona.Native.Library.Win32/Corona.Native.Library.Win32.vcxproj
index 75a6beaf8..8bda41e28 100644
--- a/platform/windows/Corona.Native.Library.Win32/Corona.Native.Library.Win32.vcxproj
+++ b/platform/windows/Corona.Native.Library.Win32/Corona.Native.Library.Win32.vcxproj
@@ -143,6 +143,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -179,6 +180,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/Corona.OutputViewer/Corona.OutputViewer.vcxproj b/platform/windows/Corona.OutputViewer/Corona.OutputViewer.vcxproj
index 1abdb74ef..7fead89e0 100644
--- a/platform/windows/Corona.OutputViewer/Corona.OutputViewer.vcxproj
+++ b/platform/windows/Corona.OutputViewer/Corona.OutputViewer.vcxproj
@@ -84,6 +84,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -101,6 +102,9 @@
     <PreBuildEvent>
       <Message>Killing off any running instances to prevent build errors</Message>
     </PreBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -116,6 +120,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -127,6 +132,9 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
     <ClCompile>
@@ -143,6 +151,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <OptimizeReferences>false</OptimizeReferences>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -154,6 +163,9 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="AlertListPane.h" />
diff --git a/platform/windows/Corona.Rtt.Library/Corona.Rtt.Library.Win32.vcxproj b/platform/windows/Corona.Rtt.Library/Corona.Rtt.Library.Win32.vcxproj
index 096cb9a37..f62bac857 100644
--- a/platform/windows/Corona.Rtt.Library/Corona.Rtt.Library.Win32.vcxproj
+++ b/platform/windows/Corona.Rtt.Library/Corona.Rtt.Library.Win32.vcxproj
@@ -1048,6 +1048,7 @@ if NOT EXIST %LIBRARY% (
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\..\external\vulkan\Include;..\..\..\external\b2Separator-cpp;..\..\..\external\fft;..\..\..\external\LuaHashMap;..\..\..\external\smoothpolygon;..\..\..\plugins\shared;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VK_USE_PLATFORM_WIN32_KHR;WIN32;_WINDOWS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/Corona.Shell/Corona.Shell.vcxproj b/platform/windows/Corona.Shell/Corona.Shell.vcxproj
index bbd4e2a3f..3d1ef7fc5 100644
--- a/platform/windows/Corona.Shell/Corona.Shell.vcxproj
+++ b/platform/windows/Corona.Shell/Corona.Shell.vcxproj
@@ -60,7 +60,11 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -70,13 +74,18 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\Corona.Native.Library.Win32\Corona.Native.Library.Win32.vcxproj">
diff --git a/platform/windows/Corona.Simulator.Native.Library.Win32/Corona.Simulator.Native.Library.Win32.vcxproj b/platform/windows/Corona.Simulator.Native.Library.Win32/Corona.Simulator.Native.Library.Win32.vcxproj
index a54bf1632..a4871d8b2 100644
--- a/platform/windows/Corona.Simulator.Native.Library.Win32/Corona.Simulator.Native.Library.Win32.vcxproj
+++ b/platform/windows/Corona.Simulator.Native.Library.Win32/Corona.Simulator.Native.Library.Win32.vcxproj
@@ -89,6 +89,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/Corona.Simulator/Corona.Simulator.vcxproj b/platform/windows/Corona.Simulator/Corona.Simulator.vcxproj
index 2a4d8fb3a..615530c5b 100644
--- a/platform/windows/Corona.Simulator/Corona.Simulator.vcxproj
+++ b/platform/windows/Corona.Simulator/Corona.Simulator.vcxproj
@@ -81,6 +81,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -93,6 +94,9 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <PostBuildEvent />
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -100,12 +104,14 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -118,6 +124,9 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <PostBuildEvent />
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
     <ClCompile>
@@ -133,6 +142,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <OptimizeReferences>false</OptimizeReferences>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -145,6 +155,9 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <PostBuildEvent />
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\external\rcedit\Project\src\rescle.h" />
diff --git a/platform/windows/CoronaBuilder/CoronaBuilder.vcxproj b/platform/windows/CoronaBuilder/CoronaBuilder.vcxproj
index 56ee03fc5..457ec7613 100644
--- a/platform/windows/CoronaBuilder/CoronaBuilder.vcxproj
+++ b/platform/windows/CoronaBuilder/CoronaBuilder.vcxproj
@@ -68,6 +68,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -83,6 +84,9 @@
     <ProjectReference>
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -91,12 +95,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>CORONABUILDER_WIN32;CORONABUILDER_HTML5;CORONABUILDER_ANDROID;WIN32;_CONSOLE;_LIB;Rtt_WIN_ENV;Rtt_WIN_DESKTOP_ENV;Rtt_NO_GUI;Rtt_NO_ARCHIVE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -115,6 +121,9 @@
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release ( call "$(SolutionDir)Build.Tools\CoronaLabsInc.Sign.bat" "$(TargetPath)" )</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\external\hmac\hmac_sha2.c" />
diff --git a/platform/windows/CryptoPP.Library/CryptoPP.Library.Win32.vcxproj b/platform/windows/CryptoPP.Library/CryptoPP.Library.Win32.vcxproj
index 0e051b9a0..7868da3ec 100644
--- a/platform/windows/CryptoPP.Library/CryptoPP.Library.Win32.vcxproj
+++ b/platform/windows/CryptoPP.Library/CryptoPP.Library.Win32.vcxproj
@@ -337,6 +337,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/Glew.Library.Win32/Glew.Library.Win32.vcxproj b/platform/windows/Glew.Library.Win32/Glew.Library.Win32.vcxproj
index 97ee98534..251cbfbda 100644
--- a/platform/windows/Glew.Library.Win32/Glew.Library.Win32.vcxproj
+++ b/platform/windows/Glew.Library.Win32/Glew.Library.Win32.vcxproj
@@ -88,6 +88,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/LPeg.Library/LPeg.Library.Win32.vcxproj b/platform/windows/LPeg.Library/LPeg.Library.Win32.vcxproj
index 2f1de2485..1fe40409a 100644
--- a/platform/windows/LPeg.Library/LPeg.Library.Win32.vcxproj
+++ b/platform/windows/LPeg.Library/LPeg.Library.Win32.vcxproj
@@ -88,6 +88,7 @@
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
diff --git a/platform/windows/Lua.Compiler/Lua.Compiler.vcxproj b/platform/windows/Lua.Compiler/Lua.Compiler.vcxproj
index cb87f0d37..cce250301 100644
--- a/platform/windows/Lua.Compiler/Lua.Compiler.vcxproj
+++ b/platform/windows/Lua.Compiler/Lua.Compiler.vcxproj
@@ -85,7 +85,11 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -95,6 +99,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -102,11 +107,15 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>call "$(SolutionDir)Build.Tools\CoronaLabsInc.Sign.bat" "$(TargetPath)"
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
     <ClCompile>
@@ -125,11 +134,15 @@
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
       <SubSystem>Console</SubSystem>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>call "$(SolutionDir)Build.Tools\CoronaLabsInc.Sign.bat" "$(TargetPath)"
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\external\lua-5.1.3\src\lapi.c" />
diff --git a/platform/windows/Lua.Console/Lua.Console.vcxproj b/platform/windows/Lua.Console/Lua.Console.vcxproj
index 2429f4292..a1d660a77 100644
--- a/platform/windows/Lua.Console/Lua.Console.vcxproj
+++ b/platform/windows/Lua.Console/Lua.Console.vcxproj
@@ -93,6 +93,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -100,6 +101,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -111,6 +115,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -118,6 +123,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -125,6 +131,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
     <ClCompile>
@@ -145,6 +154,7 @@
       <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
       <Command>if $(ConfigurationName) == Release (
@@ -152,6 +162,9 @@
 )
 </Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>$(ProjectDir)\..\Solar2DManifest.xml %(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\external\lua-5.1.3\src\lua.c" />
diff --git a/platform/windows/Lua.Library/Lua.Library.Win32.vcxproj b/platform/windows/Lua.Library/Lua.Library.Win32.vcxproj
index ad80ec29a..286028645 100644
--- a/platform/windows/Lua.Library/Lua.Library.Win32.vcxproj
+++ b/platform/windows/Lua.Library/Lua.Library.Win32.vcxproj
@@ -91,6 +91,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <PostBuildEvent />
   </ItemDefinitionGroup>
diff --git a/platform/windows/Lua.Socket.Library/Lua.Socket.Library.Win32.vcxproj b/platform/windows/Lua.Socket.Library/Lua.Socket.Library.Win32.vcxproj
index 3418b6b6d..9f218a746 100644
--- a/platform/windows/Lua.Socket.Library/Lua.Socket.Library.Win32.vcxproj
+++ b/platform/windows/Lua.Socket.Library/Lua.Socket.Library.Win32.vcxproj
@@ -159,6 +159,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <WholeProgramOptimization>false</WholeProgramOptimization>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/Ogg.Vorbis.Library/Ogg.Vorbis.Library.Win32.vcxproj b/platform/windows/Ogg.Vorbis.Library/Ogg.Vorbis.Library.Win32.vcxproj
index eb739f729..292ac6501 100644
--- a/platform/windows/Ogg.Vorbis.Library/Ogg.Vorbis.Library.Win32.vcxproj
+++ b/platform/windows/Ogg.Vorbis.Library/Ogg.Vorbis.Library.Win32.vcxproj
@@ -154,6 +154,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/OpenAL.Library.Win32/OpenAL.Library.Win32.vcxproj b/platform/windows/OpenAL.Library.Win32/OpenAL.Library.Win32.vcxproj
index 034c4fa72..791e801fb 100644
--- a/platform/windows/OpenAL.Library.Win32/OpenAL.Library.Win32.vcxproj
+++ b/platform/windows/OpenAL.Library.Win32/OpenAL.Library.Win32.vcxproj
@@ -90,6 +90,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/Pthreads.Library.Win32/Pthreads.Library.Win32.vcxproj b/platform/windows/Pthreads.Library.Win32/Pthreads.Library.Win32.vcxproj
index 77a3218f5..c0f2d5c3d 100644
--- a/platform/windows/Pthreads.Library.Win32/Pthreads.Library.Win32.vcxproj
+++ b/platform/windows/Pthreads.Library.Win32/Pthreads.Library.Win32.vcxproj
@@ -91,6 +91,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/platform/windows/SQLite.Library/SQLite.Library.Win32.vcxproj b/platform/windows/SQLite.Library/SQLite.Library.Win32.vcxproj
index 648f4bc17..f1bb9358a 100644
--- a/platform/windows/SQLite.Library/SQLite.Library.Win32.vcxproj
+++ b/platform/windows/SQLite.Library/SQLite.Library.Win32.vcxproj
@@ -83,6 +83,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PreRelease|Win32'">
diff --git a/platform/windows/Solar2DManifest.xml b/platform/windows/Solar2DManifest.xml
new file mode 100644
index 000000000..a83924f4e
--- /dev/null
+++ b/platform/windows/Solar2DManifest.xml
@@ -0,0 +1,10 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings
+      xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings"
+      xmlns:ws3="http://schemas.microsoft.com/SMI/2019/WindowsSettings">
+        <ws2:longPathAware>true</ws2:longPathAware>
+        <ws3:activeCodePage>UTF-8</ws3:activeCodePage>
+    </windowsSettings>
+  </application>
+</assembly>
diff --git a/platform/windows/luafilesystem/luafilesystem_dll.vcxproj b/platform/windows/luafilesystem/luafilesystem_dll.vcxproj
index fa726bcd0..d152a8648 100644
--- a/platform/windows/luafilesystem/luafilesystem_dll.vcxproj
+++ b/platform/windows/luafilesystem/luafilesystem_dll.vcxproj
@@ -70,7 +70,7 @@
       <Optimization>Disabled</Optimization>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>false</MinimalRebuild>
       <AdditionalIncludeDirectories>
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUAFILESYSTEM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -83,6 +83,7 @@
       <ProgramDataBaseFileName>
       </ProgramDataBaseFileName>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Midl>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -133,6 +134,7 @@
       </ObjectFileName>
       <ProgramDataBaseFileName>
       </ProgramDataBaseFileName>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <PostBuildEvent>
       <Command>call "$(SolutionDir)Build.Tools\CoronaLabsInc.Sign.bat" "$(TargetPath)"</Command>