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

[SM60 1/2] Upgrade Spidermonkey build system and binaries to 60.9.1

Browse Source 
This changes VS to use the same library name as other platforms, since
the toolsets are binary-compatible going forward. This makes the build
script slightly more streamlined on windows.
Also enable building NSPR on windows as part of the spidermonkey build,
instead of compiling it separately.

Tested by: SubitaNeo, Stan
Refs #5859

Differential Revision: https://code.wildfiregames.com/D3115
This was SVN commit r24242.
This commit is contained in:
wraitii
2020-11-24 15:41:52 +00:00
parent a226c4804e
commit f2cf2c97ad
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/workspaces/clean-workspaces.sh
+7 -1
View File
@@ -33,11 +33,17 @@ if [ "$preserve_libs" != "true" ]; then
(cd ../../libraries/source/fcollada/src && rm -rf ./output)
(cd ../../libraries/source/nvtt/src && rm -rf ./build)
(cd ../../libraries/source/spidermonkey && rm -f .already-built)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-45.0.2)
(cd ../../libraries/source/spidermonkey && rm -rf ./lib)
(cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-debug)
(cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-release)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-62.9.1)
fi
# Still delete the directory of previous SpiderMonkey versions to
# avoid wasting disk space if people clean workspaces after updating.
(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-38.0.0)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs-38.0.0)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs31)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs24)
build/workspaces/update-workspaces.sh
+3 -3
View File
@@ -41,7 +41,7 @@ premake_args=""
with_system_premake5=false
without_nvtt=false
with_system_nvtt=false
with_system_mozjs52=false
with_system_mozjs=false
enable_atlas=true
for i in "$@"
@@ -50,7 +50,7 @@ do
--with-system-premake5 ) with_system_premake5=true ;;
--without-nvtt ) without_nvtt=true; premake_args="${premake_args} --without-nvtt" ;;
--with-system-nvtt ) with_system_nvtt=true; premake_args="${premake_args} --with-system-nvtt" ;;
--with-system-mozjs52 ) with_system_mozjs52=true; premake_args="${premake_args} --with-system-mozjs52" ;;
--with-system-mozjs ) with_system_mozjs=true; premake_args="${premake_args} --with-system-mozjs" ;;
--enable-atlas ) enable_atlas=true ;;
--disable-atlas ) enable_atlas=false ;;
-j* ) JOBS=$i ;;
@@ -87,7 +87,7 @@ if [ "`uname -s`" != "Darwin" ]; then
# Build/update bundled external libraries
(cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed"
echo
if [ "$with_system_mozjs52" = "false" ]; then
if [ "$with_system_mozjs" = "false" ]; then
(cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"
fi
echo