abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

[SM68 1/2] Upgrade Spidermonkey build system and binaries to 68.12.1

Browse Source 
No noteworthy build system changes, however rust is now necessary for
Spidermonkey compilation.
On windows, clang-cl is now necessary.

Tested by: Freagarach, Stan, Subitaneo
Refs #5860

Differential Revision: https://code.wildfiregames.com/D3143
This was SVN commit r24296.
This commit is contained in:
wraitii 2020-11-30 08:59:49 +00:00
parent d2075bed5d
commit d8332a2938
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/premake/extern_libs5.lua
View File

@ -585,7 +585,7 @@ extern_lib_defs = {
compile_settings = function() compile_settings = function()
if _OPTIONS["with-system-mozjs"] then if _OPTIONS["with-system-mozjs"] then
if not _OPTIONS["android"] then if not _OPTIONS["android"] then
pkgconfig.add_includes("mozjs-60") pkgconfig.add_includes("mozjs-68")
end end
else else
if os.istarget("windows") then if os.istarget("windows") then
@ -605,15 +605,15 @@ extern_lib_defs = {
link_settings = function() link_settings = function()
if _OPTIONS["with-system-mozjs"] then if _OPTIONS["with-system-mozjs"] then
if _OPTIONS["android"] then if _OPTIONS["android"] then
links { "mozjs-60" } links { "mozjs-68" }
else else
pkgconfig.add_links("mozjs-60") pkgconfig.add_links("mozjs-68")
end end
else else
filter { "Debug" } filter { "Debug" }
links { "mozjs60-ps-debug" } links { "mozjs68-ps-debug" }
filter { "Release" } filter { "Release" }
links { "mozjs60-ps-release" } links { "mozjs68-ps-release" }
filter { } filter { }
add_source_lib_paths("spidermonkey") add_source_lib_paths("spidermonkey")
end end

5
build/workspaces/clean-workspaces.sh
View File

@ -33,14 +33,15 @@ if [ "$preserve_libs" != "true" ]; then
(cd ../../libraries/source/fcollada/src && rm -rf ./output) (cd ../../libraries/source/fcollada/src && rm -rf ./output)
(cd ../../libraries/source/nvtt/src && rm -rf ./build) (cd ../../libraries/source/nvtt/src && rm -rf ./build)
(cd ../../libraries/source/spidermonkey && rm -f .already-built) (cd ../../libraries/source/spidermonkey && rm -f .already-built)
(cd ../../libraries/source/spidermonkey && rm -rf ./lib) (cd ../../libraries/source/spidermonkey && rm -rf ./lib/*.a && rm -rf ./lib/*.so)
(cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-debug) (cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-debug)
(cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-release) (cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-release)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-62.9.1) (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-68.12.1)
fi fi
# Still delete the directory of previous SpiderMonkey versions to # Still delete the directory of previous SpiderMonkey versions to
# avoid wasting disk space if people clean workspaces after updating. # avoid wasting disk space if people clean workspaces after updating.
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-62.9.1)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-52.9.1pre1) (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-52.9.1pre1)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-45.0.2) (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-45.0.2)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-38.0.0) (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-38.0.0)

4
source/scriptinterface/ScriptTypes.h
View File

@ -73,7 +73,7 @@
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif
#if MOZJS_MAJOR_VERSION != 60 #if MOZJS_MAJOR_VERSION != 68
#error Your compiler is trying to use an incorrect major version of the \ #error Your compiler is trying to use an incorrect major version of the \
SpiderMonkey library. The only version that works is the one in the \ SpiderMonkey library. The only version that works is the one in the \
libraries/spidermonkey/ directory, and it will not work with a typical \ libraries/spidermonkey/ directory, and it will not work with a typical \
@ -81,7 +81,7 @@ system-installed version. Make sure you have got all the right files and \
include paths. include paths.
#endif #endif
#if MOZJS_MINOR_VERSION != 9 #if MOZJS_MINOR_VERSION != 12
#error Your compiler is trying to use an untested minor version of the \ #error Your compiler is trying to use an untested minor version of the \
SpiderMonkey library. If you are a package maintainer, please make sure \ SpiderMonkey library. If you are a package maintainer, please make sure \
to check very carefully that this version does not change the behaviour \ to check very carefully that this version does not change the behaviour \