mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop premake4 support, refs #3729. premake4 has been unused for a long time now, and was only left available as a safety net.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D1275
This was SVN commit r21955.
This commit is contained in:
Itms
2018-12-26 16:00:53 +00:00
parent b87b7d4ed4
commit 46ddffdd3f
242 changed files with 4 additions and 54171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/workspaces/clean-workspaces.sh
-3
View File
@@ -41,9 +41,6 @@ fi
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs31)
(cd ../../libraries/source/spidermonkey && rm -rf ./mozjs24)
(cd ../premake/premake4/build/gmake.bsd && ${MAKE} clean)
(cd ../premake/premake4/build/gmake.macosx && ${MAKE} clean)
(cd ../premake/premake4/build/gmake.unix && ${MAKE} clean)
(cd ../premake/premake5/build/gmake.bsd && ${MAKE} clean)
(cd ../premake/premake5/build/gmake.macosx && ${MAKE} clean)
(cd ../premake/premake5/build/gmake.unix && ${MAKE} clean)
build/workspaces/update-workspaces.sh
+4 -12
View File
@@ -36,7 +36,6 @@ esac
# Parse command-line options:
premake_version="premake5"
premake_args=""
without_nvtt=false
@@ -52,7 +51,6 @@ do
--with-system-mozjs38 ) with_system_mozjs38=true; premake_args="${premake_args} --with-system-mozjs38" ;;
--enable-atlas ) enable_atlas=true ;;
--disable-atlas ) enable_atlas=false ;;
--premake4 ) premake_version="premake4"; premake_args="${premake_args} --collada" ;;
-j* ) JOBS=$i ;;
# Assume any other --options are for Premake
--* ) premake_args="${premake_args} $i" ;;
@@ -98,7 +96,7 @@ if [ "`uname -s`" != "Darwin" ]; then
fi
# Now build premake and run it to create the makefiles
cd ../premake/"$premake_version"
cd ../premake/premake5
PREMAKE_BUILD_DIR=build/gmake.unix
# BSD and OS X need different Makefiles
case "`uname -s`" in
@@ -123,17 +121,11 @@ export HOSTTYPE="$HOSTTYPE"
echo "Premake args: ${premake_args}"
if [ "`uname -s`" != "Darwin" ]; then
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
premake5/bin/release/premake5 --file="premake5.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
else
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/gcc/" --macosx-version-min="${MIN_OSX_VERSION}" ${premake_args} gmake || die "Premake failed"
premake5/bin/release/premake5 --file="premake5.lua" --outpath="../workspaces/gcc/" --macosx-version-min="${MIN_OSX_VERSION}" ${premake_args} gmake || die "Premake failed"
# Also generate xcode workspaces if on OS X
if [ "$premake_version" = "premake4" ]; then
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/xcode3" ${premake_args} xcode3 || die "Premake failed"
fi
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/xcode4" ${premake_args} xcode4 || die "Premake failed"
fi
if [ "$premake_version" = "premake4" ]; then
"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/codeblocks/" ${premake_args} codeblocks || die "Premake failed"
premake5/bin/release/premake5 --file="premake5.lua" --outpath="../workspaces/xcode4" ${premake_args} xcode4 || die "Premake failed"
fi
# test_root.cpp gets generated by cxxtestgen and passing different arguments to premake could require a regeneration of this file.