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

[SM52 3/2] Revert static linking change on linux - other fixes.

Browse Source 
This reverts static linking on linux from 6bb08fb424, it appears to fail
to link and/or crash, depending.

- Commit the tarball.
- Update update-workspaces.sh

Refs #4893

Differential Revision: https://code.wildfiregames.com/D3114
This was SVN commit r24205.
This commit is contained in:
wraitii
2020-11-18 19:08:15 +00:00
parent fd8f5abd2e
commit 0cbd07b455
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/workspaces/update-workspaces.sh
+3 -3
View File
@@ -41,7 +41,7 @@ premake_args=""
with_system_premake5=false with_system_premake5=false
without_nvtt=false without_nvtt=false
with_system_nvtt=false with_system_nvtt=false
with_system_mozjs45=false with_system_mozjs52=false
enable_atlas=true enable_atlas=true
for i in "$@" for i in "$@"
@@ -50,7 +50,7 @@ do
--with-system-premake5 ) with_system_premake5=true ;; --with-system-premake5 ) with_system_premake5=true ;;
--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-mozjs45 ) with_system_mozjs45=true; premake_args="${premake_args} --with-system-mozjs45" ;; --with-system-mozjs52 ) with_system_mozjs52=true; premake_args="${premake_args} --with-system-mozjs52" ;;
--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 ;;
@@ -87,7 +87,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_mozjs45" = "false" ]; then if [ "$with_system_mozjs52" = "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