Ticket #1619: largeaddressaware.patch
File largeaddressaware.patch, 3.6 KB (added by , 8 years ago) |
---|
-
build/premake/premake4.lua
function project_set_build_flags() 214 214 -- use native wchar_t type (not typedef to unsigned short) 215 215 flags { "NativeWChar" } 216 216 217 217 else -- *nix 218 218 219 -- TODO, FIXME: This check is incorrect because it means that some additional flags will be added inside the "else" branch if the 219 -- TODO, FIXME: This check is incorrect because it means that some additional flags will be added inside the "else" branch if the 220 220 -- compiler is ICC and minimal-flags is specified (ticket: #2994) 221 221 if cc == "icc" and not _OPTIONS["minimal-flags"] then 222 222 buildoptions { 223 223 "-w1", 224 224 -- "-Wabi", … … function project_set_build_flags() 294 294 -- Note that all these features are already supported on amd64. 295 295 "-march=pentium3 -mtune=generic" 296 296 } 297 297 end 298 298 end 299 299 300 300 buildoptions { 301 301 -- Enable C++11 standard. 302 302 "-std=c++0x" 303 303 } 304 304 … … function project_set_build_flags() 377 377 linkoptions { "-Wl,-z,origin" } 378 378 end 379 379 380 380 -- Adding the executable path and taking care of correct escaping 381 381 if _ACTION == "gmake" then 382 linkoptions { "-Wl,-rpath,'$$ORIGIN'" } 382 linkoptions { "-Wl,-rpath,'$$ORIGIN'" } 383 383 elseif _ACTION == "codeblocks" then 384 384 linkoptions { "-Wl,-R\\\\$$$ORIGIN" } 385 385 end 386 386 end 387 387 end … … function setup_all_libs () 605 605 extern_libs = { 606 606 "iconv", 607 607 "boost", 608 608 } 609 609 setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } ) 610 610 611 611 -- 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 612 612 if _ACTION == "vs2013" then 613 buildoptions { 613 buildoptions { 614 614 "/wd4127", 615 615 "/wd4309", 616 616 "/wd4800", 617 617 "/wd4100", 618 618 "/wd4996", … … function setup_all_libs () 728 728 "libcurl", 729 729 "tinygettext", 730 730 "icu", 731 731 "iconv", 732 732 } 733 733 734 734 if not _OPTIONS["without-audio"] then 735 735 table.insert(extern_libs, "openal") 736 736 table.insert(extern_libs, "vorbis") 737 737 end 738 738 739 739 setup_static_lib_project("engine", source_dirs, extern_libs, {}) 740 740 741 741 742 742 source_dirs = { 743 743 "graphics", … … function setup_all_libs () 841 841 bsd = { "lib/sysdep/os/bsd", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" }, 842 842 } 843 843 for i,v in pairs(sysdep_dirs[os.get()]) do 844 844 table.insert(source_dirs, v); 845 845 end 846 846 847 847 if os.is("linux") then 848 848 if _OPTIONS["android"] then 849 849 table.insert(source_dirs, "lib/sysdep/os/android") 850 850 else 851 851 table.insert(source_dirs, "lib/sysdep/os/unix/x") … … function setup_main_exe () 970 970 -- see wstartup.h 971 971 "/INCLUDE:_wstartup_InitAndRegisterShutdown", 972 972 973 973 -- allow manual unload of delay-loaded DLLs 974 974 "/DELAY:UNLOAD", 975 976 -- allow the executable to use more than 2 GB of ram. 977 "/LARGEADDRESSAWARE", 975 978 } 976 979 977 980 -- see manifest.cpp 978 981 project_add_manifest() 979 982 … … function setup_atlas_projects() 1086 1089 1087 1090 setup_atlas_project("AtlasObject", "StaticLib", 1088 1091 { -- src 1089 1092 ".", 1090 1093 "../../../third_party/jsonspirit" 1091 1094 1092 1095 },{ -- include 1093 1096 "../../../third_party/jsonspirit" 1094 1097 },{ -- extern_libs 1095 1098 "boost", 1096 1099 "iconv", … … function setup_atlas_frontend_project (p 1183 1186 if os.is("windows") then 1184 1187 defines { "_UNICODE" } 1185 1188 1186 1189 -- required to use WinMain() on Windows, otherwise will default to main() 1187 1190 flags { "WinMain" } 1188 1191 1189 1192 -- see manifest.cpp 1190 1193 project_add_manifest() 1191 1194 1192 1195 else -- Non-Windows, = Unix 1193 1196 links { "AtlasObject" }