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

(2/2) Update premake5 to Alpha 15 - shell scripts

Browse Source 
Update build shell scripts to use premake5 `gmake2.*` directories.
(The old `gmake.*` directories have been removed from premake5.)


Differential Revision: https://code.wildfiregames.com/D3219
This was SVN commit r24388.
This commit is contained in:
s0600204 2020-12-14 02:22:58 +00:00
parent a0d2112195
commit 2e27ece0a0
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,9 +51,15 @@ fi
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs31)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs24)
(cd ../premake/premake5/build/gmake.bsd && ${MAKE} clean)
(cd ../premake/premake5/build/gmake.macosx && ${MAKE} clean)
(cd ../premake/premake5/build/gmake.unix && ${MAKE} clean)
# Delete former premake5 gmake.* directories
(cd ../premake/premake5/build && rm -rf ./gmake.bsd)
(cd ../premake/premake5/build && rm -rf ./gmake.macosx)
(cd ../premake/premake5/build && rm -rf ./gmake.unix)
# Cleanup current premake directories
(cd ../premake/premake5/build/gmake2.bsd && ${MAKE} clean)
(cd ../premake/premake5/build/gmake2.macosx && ${MAKE} clean)
(cd ../premake/premake5/build/gmake2.unix && ${MAKE} clean)
echo "Removing generated test files..."

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

@ -103,17 +103,17 @@ premake_command="premake5"
if [ "$with_system_premake5" = "false" ]; then
# Build bundled premake
cd ../premake/premake5
PREMAKE_BUILD_DIR=build/gmake.unix
PREMAKE_BUILD_DIR=build/gmake2.unix
# BSD and OS X need different Makefiles
case "`uname -s`" in
"GNU/kFreeBSD" )
# use default gmake.unix (needs -ldl as we have a GNU userland and libc)
# use default gmake2.unix (needs -ldl as we have a GNU userland and libc)
;;
*"BSD" )
PREMAKE_BUILD_DIR=build/gmake.bsd
PREMAKE_BUILD_DIR=build/gmake2.bsd
;;
"Darwin" )
PREMAKE_BUILD_DIR=build/gmake.macosx
PREMAKE_BUILD_DIR=build/gmake2.macosx
;;
esac
${MAKE} -C $PREMAKE_BUILD_DIR ${JOBS} || die "Premake build failed"