Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/premake/premake5.lua
View File

@ -6,7 +6,7 @@ newoption { trigger = "icc", description = "Use Intel C++ Compiler (Linux only;
newoption { trigger = "jenkins-tests", description = "Configure CxxTest to use the XmlPrinter runner which produces Jenkins-compatible output" } newoption { trigger = "jenkins-tests", description = "Configure CxxTest to use the XmlPrinter runner which produces Jenkins-compatible output" }
newoption { trigger = "minimal-flags", description = "Only set compiler/linker flags that are really needed. Has no effect on Windows builds" } newoption { trigger = "minimal-flags", description = "Only set compiler/linker flags that are really needed. Has no effect on Windows builds" }
newoption { trigger = "outpath", description = "Location for generated project files" } newoption { trigger = "outpath", description = "Location for generated project files" }
newoption { trigger = "with-system-mozjs38", description = "Search standard paths for libmozjs38, instead of using bundled copy" } newoption { trigger = "with-system-mozjs45", description = "Search standard paths for libmozjs45, instead of using bundled copy" }
newoption { trigger = "with-system-nvtt", description = "Search standard paths for nvidia-texture-tools library, instead of using bundled copy" } newoption { trigger = "with-system-nvtt", description = "Search standard paths for nvidia-texture-tools library, instead of using bundled copy" }
newoption { trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" } newoption { trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" }
newoption { trigger = "without-lobby", description = "Disable the use of gloox and the multiplayer lobby" } newoption { trigger = "without-lobby", description = "Disable the use of gloox and the multiplayer lobby" }

6
build/workspaces/update-workspaces.sh
View File

@ -40,7 +40,7 @@ premake_args=""
without_nvtt=false without_nvtt=false
with_system_nvtt=false with_system_nvtt=false
with_system_mozjs38=false with_system_mozjs45=false
enable_atlas=true enable_atlas=true
for i in "$@" for i in "$@"
@ -48,7 +48,7 @@ do
case $i in case $i in
--without-nvtt ) without_nvtt=true; premake_args="${premake_args} --without-nvtt" ;; --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-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 ;; --enable-atlas ) enable_atlas=true ;;
--disable-atlas ) enable_atlas=false ;; --disable-atlas ) enable_atlas=false ;;
-j* ) JOBS=$i ;; -j* ) JOBS=$i ;;
@ -85,7 +85,7 @@ if [ "`uname -s`" != "Darwin" ]; then
# Build/update bundled external libraries # Build/update bundled external libraries
(cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed" (cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed"
echo 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" (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"
fi fi
echo echo