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

Update update-workspaces.sh and premake5.lua with the with-system-mozjs45 flag from SpiderMonkey 45 in 64b477625d, refs #4893.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D2170
This was SVN commit r22660.
This commit is contained in:
elexis
2019-08-13 11:30:46 +00:00
parent a0be131afe
commit 8dc425be5d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/workspaces/update-workspaces.sh
+3 -3
View File
@@ -40,7 +40,7 @@ premake_args=""
without_nvtt=false
with_system_nvtt=false
with_system_mozjs38=false
with_system_mozjs45=false
enable_atlas=true
for i in "$@"
@@ -48,7 +48,7 @@ do
case $i in
--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-mozjs38 ) with_system_mozjs38=true; premake_args="${premake_args} --with-system-mozjs38" ;;
--with-system-mozjs45 ) with_system_mozjs45=true; premake_args="${premake_args} --with-system-mozjs45" ;;
--enable-atlas ) enable_atlas=true ;;
--disable-atlas ) enable_atlas=false ;;
-j* ) JOBS=$i ;;
@@ -85,7 +85,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_mozjs38" = "false" ]; then
if [ "$with_system_mozjs45" = "false" ]; then
(cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"
fi
echo