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

Do not attempt to rebuild bundled libs every time, and do not run CMAKE for nvtt everytime. Also pass -fpic for NVTT to prevent build failures on FreeBSD (reported by @nephele).

Browse Source 
Unify the build scripts between macOS and Linux.

Reviewed by: @Freagarach, @wraitii
Differential Revision: https://code.wildfiregames.com/D3173
This was SVN commit r24310.
This commit is contained in:
Stan
2020-12-01 19:29:21 +00:00
parent 6f841d0ccb
commit d38fde3682
3 changed files with 13 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/workspaces/clean-workspaces.sh
+2
View File
@@ -31,7 +31,9 @@ if [ "$preserve_libs" != "true" ]; then
echo "Cleaning bundled third-party dependencies..."
(cd ../../libraries/source/fcollada/src && rm -rf ./output)
(cd ../../libraries/source/fcollada && rm -f .already-built)
(cd ../../libraries/source/nvtt/src && rm -rf ./build)
(cd ../../libraries/source/nvtt && rm -f .already-built)
(cd ../../libraries/source/spidermonkey && rm -f .already-built)
(cd ../../libraries/source/spidermonkey && rm -rf ./lib/*.a && rm -rf ./lib/*.so)
(cd ../../libraries/source/spidermonkey && rm -rf ./include-unix-debug)
build/workspaces/update-workspaces.sh
Regular → Executable
+1 -1
View File
@@ -85,7 +85,7 @@ if [ "`uname -s`" != "Darwin" ]; then
echo
# Build/update bundled external libraries
(cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed"
(cd ../../libraries/source/fcollada && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "FCollada build failed"
echo
if [ "$with_system_mozjs" = "false" ]; then
(cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"