gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

[SM78 1/2] Upgrade Spidermonkey build system and binaries to 78.6.0

Browse Source 
SM78 drops usage of Python 2 in favour of Python 3.

SM78 is the first ESR to actually use rust, which means a new static
library is bundled.
This means LLVM-objdump is now a dependency of Spidermonkey, and also 0
A.D.

SM78 also removes the need for NSPR on Windows (Bug 1556646).

Tested by: Stan, Freagarach, mammadori
Refs #5694
Refs #5861

Differential Revision: https://code.wildfiregames.com/D3167
This was SVN commit r24332.
This commit is contained in:
wraitii
2020-12-06 14:00:57 +00:00
parent 46413134bb
commit 6da64bf354
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/premake/extern_libs5.lua
+11 -6
View File
@@ -585,7 +585,7 @@ extern_lib_defs = {
compile_settings = function()
if _OPTIONS["with-system-mozjs"] then
if not _OPTIONS["android"] then
pkgconfig.add_includes("mozjs-68")
pkgconfig.add_includes("mozjs-78")
end
else
if os.istarget("windows") then
@@ -605,15 +605,20 @@ extern_lib_defs = {
link_settings = function()
if _OPTIONS["with-system-mozjs"] then
if _OPTIONS["android"] then
links { "mozjs-68" }
links { "mozjs-78" }
else
pkgconfig.add_links("mozjs-68")
pkgconfig.add_links("mozjs-78")
end
else
filter { "Debug" }
links { "mozjs68-ps-debug" }
filter { "Debug", "action:vs*" }
links { "mozjs78-ps-debug" }
links { "mozjs78-ps-rust-debug" }
filter { "Debug", "action:not vs*" }
links { "mozjs78-ps-debug" }
links { "mozjs78-ps-rust" }
filter { "Release" }
links { "mozjs68-ps-release" }
links { "mozjs78-ps-release" }
links { "mozjs78-ps-rust" }
filter { }
add_source_lib_paths("spidermonkey")
end