Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove leftovers from bundled miniupnpc. Refs #2552.

Browse Source 
Fix cleanup of SM24.

This was SVN commit r15873.
This commit is contained in:
leper 2014-10-15 15:34:32 +00:00
parent c1575e8f48
commit f5179930f5
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/workspaces/clean-workspaces.sh
View File

@ -24,7 +24,7 @@ if [ "`uname -s`" != "Darwin" ]; then
(cd ../../libraries/source/fcollada/src && rm -rf ./output)
(cd ../../libraries/source/spidermonkey && rm -f .already-built)
(cd ../../libraries/source/spidermonkey && rm -rf ./js-1.8.5)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs24)
(cd ../../libraries/source/nvtt/src && rm -rf ./build)
fi

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

@ -40,7 +40,6 @@ premake_args=""
without_nvtt=false
with_system_nvtt=false
with_system_miniupnpc=false
with_system_mozjs24=false
enable_atlas=true
@ -94,10 +93,6 @@ if [ "`uname -s`" != "Darwin" ]; then
(cd ../../libraries/source/nvtt && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "NVTT build failed"
fi
echo
if [ "$with_system_miniupnpc" = "false" ]; then
(cd ../../libraries/source/miniupnpc && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "MiniUPnPc build failed"
fi
echo
fi
# Now build premake and run it to create the makefiles