Ticket #1619: largeaddressaware.patch

build/premake/premake4.lua

@@ -214 +214 @@
         -- use native wchar_t type (not typedef to unsigned short)
         flags { "NativeWChar" }
 
     else    -- *nix
 
-        -- TODO, FIXME: This check is incorrect because it means that some additional flags will be added inside the "else" branch if the 
+        -- TODO, FIXME: This check is incorrect because it means that some additional flags will be added inside the "else" branch if the
         -- compiler is ICC and minimal-flags is specified (ticket: #2994)
         if cc == "icc" and not _OPTIONS["minimal-flags"] then
             buildoptions {
                 "-w1",
                 -- "-Wabi",
@@ -294 +294 @@
                         -- Note that all these features are already supported on amd64.
                         "-march=pentium3 -mtune=generic"
                     }
                 end
             end
-            
+
             buildoptions {
                 -- Enable C++11 standard.
                 "-std=c++0x"
             }
 
@@ -377 +377 @@
                     linkoptions { "-Wl,-z,origin" }
                 end
 
                 -- Adding the executable path and taking care of correct escaping
                 if _ACTION == "gmake" then
-                    linkoptions { "-Wl,-rpath,'$$ORIGIN'" } 
+                    linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
                 elseif _ACTION == "codeblocks" then
                     linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
                 end
             end
         end
@@ -605 +605 @@
     extern_libs = {
         "iconv",
         "boost",
     }
     setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } )
-    
+
     -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output
     if _ACTION == "vs2013" then
-        buildoptions { 
+        buildoptions {
             "/wd4127",
             "/wd4309",
             "/wd4800",
             "/wd4100",
             "/wd4996",
@@ -728 +728 @@
         "libcurl",
         "tinygettext",
         "icu",
         "iconv",
     }
-    
+
     if not _OPTIONS["without-audio"] then
         table.insert(extern_libs, "openal")
         table.insert(extern_libs, "vorbis")
     end
-    
+
     setup_static_lib_project("engine", source_dirs, extern_libs, {})
 
 
     source_dirs = {
         "graphics",
@@ -841 +841 @@
         bsd = { "lib/sysdep/os/bsd", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" },
     }
     for i,v in pairs(sysdep_dirs[os.get()]) do
         table.insert(source_dirs, v);
     end
-    
+
     if os.is("linux") then
         if _OPTIONS["android"] then
             table.insert(source_dirs, "lib/sysdep/os/android")
         else
             table.insert(source_dirs, "lib/sysdep/os/unix/x")
@@ -970 +970 @@
             -- see wstartup.h
             "/INCLUDE:_wstartup_InitAndRegisterShutdown",
 
             -- allow manual unload of delay-loaded DLLs
             "/DELAY:UNLOAD",
+
+            -- allow the executable to use more than 2 GB of ram.
+            "/LARGEADDRESSAWARE",
         }
 
         -- see manifest.cpp
         project_add_manifest()
 
@@ -1086 +1089 @@
 
     setup_atlas_project("AtlasObject", "StaticLib",
     {   -- src
         ".",
         "../../../third_party/jsonspirit"
-        
+
     },{ -- include
         "../../../third_party/jsonspirit"
     },{ -- extern_libs
         "boost",
         "iconv",
@@ -1183 +1186 @@
     if os.is("windows") then
         defines { "_UNICODE" }
 
         -- required to use WinMain() on Windows, otherwise will default to main()
         flags { "WinMain" }
-        
+
         -- see manifest.cpp
         project_add_manifest()
 
     else -- Non-Windows, = Unix
         links { "AtlasObject" }