007f73dfa0
* Gendered Civilians * Direct Font Rendering * Support for JavaScript Modules * New Game-Setup Options * Lobby improvements * Engine upgrades and updated platform support * New quotes and tips * Various balancing improvements - See https://play0ad.com/new-release-0-a-d-release-28-boiorix/ for more details. - This updates SpiderMonkey to version 128 (from 115), but mozjs128 has already been dropped from Factory. Since upstream intends to switch to version 140 anyway, we add 0002-Use-mozjs-140.patch and 0003-Adapt-JS-API-to-ESR-140.patch so that we can already build this version with mozjs140. OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=158
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua
|
|
index b9fdd70..d732f15 100644
|
|
--- a/build/premake/extern_libs5.lua
|
|
+++ b/build/premake/extern_libs5.lua
|
|
@@ -641,7 +641,7 @@ extern_lib_defs = {
|
|
|
|
if _OPTIONS["with-system-mozjs"] then
|
|
if not _OPTIONS["android"] then
|
|
- pkgconfig.add_includes_after("mozjs-128")
|
|
+ pkgconfig.add_includes_after("mozjs-140")
|
|
end
|
|
else
|
|
filter "Debug"
|
|
@@ -657,7 +657,7 @@ extern_lib_defs = {
|
|
if _OPTIONS["android"] then
|
|
links { "mozjs-128" }
|
|
else
|
|
- pkgconfig.add_links("mozjs-128")
|
|
+ pkgconfig.add_links("mozjs-140")
|
|
end
|
|
else
|
|
filter { "Debug" }
|
|
diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua
|
|
index 357b08f..8b1630a 100644
|
|
--- a/build/premake/premake5.lua
|
|
+++ b/build/premake/premake5.lua
|
|
@@ -165,7 +165,7 @@ end
|
|
-- The pc file doesn't specify the required -DDEBUG needed in that case
|
|
local mozjs_is_debug_build = false
|
|
if _OPTIONS["with-system-mozjs"] then
|
|
- local _, errorCode = os.outputof(cc .. " $(pkg-config mozjs-128 --cflags) ./tests/mozdebug.c -o /dev/null")
|
|
+ local _, errorCode = os.outputof(cc .. " $(pkg-config mozjs-140 --cflags) ./tests/mozdebug.c -o /dev/null")
|
|
if errorCode ~= 0 then
|
|
mozjs_is_debug_build = true
|
|
end
|