mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-06-20 23:44:08 +00:00
Remove ScriptTypes and ScriptExtraHeaders headers
The first header was used to include the SpiderMonkey JS API at once, with safeguards and preprocessor defines. Nowadays, SpiderMonkey provides modular headers allowing us to include what we use, refs #8086. Some defines have to be moved to compiler options but it is apparently a mistake from the SM developers: https://bugzilla.mozilla.org/show_bug.cgi?id=1987876
This commit is contained in:
@@ -643,6 +643,17 @@ extern_lib_defs = {
|
||||
},
|
||||
spidermonkey = {
|
||||
compile_settings = function()
|
||||
-- This define is not supposed to be needed anymore, but it leaks into the
|
||||
-- SpiderMonkey headers, and is necessary to build with ESR140 at the time
|
||||
-- of writing (https://bugzilla.mozilla.org/show_bug.cgi?id=1987876).
|
||||
filter "system:windows"
|
||||
defines { "XP_WIN" }
|
||||
filter { }
|
||||
|
||||
filter "Debug"
|
||||
defines { "MOZ_DIAGNOSTIC_ASSERT_ENABLED" }
|
||||
filter {}
|
||||
|
||||
if _OPTIONS["with-system-mozjs"] then
|
||||
if not _OPTIONS["android"] then
|
||||
pkgconfig.add_includes_after("mozjs-128")
|
||||
|
||||
Reference in New Issue
Block a user