mirror of https://github.com/axmolengine/axmol.git
Android build uses linux as host. And a fix in generate-jsbindings.sh.
This commit is contained in:
parent
6ac72da487
commit
8d2dcfe4be
|
@ -14,7 +14,7 @@ install_android_ndk()
|
|||
{
|
||||
# Download android ndk
|
||||
echo "Download android ndk ..."
|
||||
if [ "$PLATFORM"x = "linux"x ]; then
|
||||
if [ "$PLATFORM"x = "android"x ]; then
|
||||
HOST_NAME="linux"
|
||||
elif [ "$PLATFORM"x = "ios"x ]; then
|
||||
HOST_NAME="darwin"
|
||||
|
|
|
@ -16,10 +16,6 @@
|
|||
# * $NDK_ROOT
|
||||
#
|
||||
|
||||
#Set git user
|
||||
git config --global user.email "CocosRobot@gmail.com"
|
||||
git config --global user.name ${GH_USER}
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
COCOS2DX_ROOT="$DIR"/../..
|
||||
TOJS_ROOT=$COCOS2DX_ROOT/tools/tojs
|
||||
|
@ -53,6 +49,10 @@ if [ "$GEN_JSB"x != "YES"x ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
#Set git user
|
||||
git config --global user.email "CocosRobot@gmail.com"
|
||||
git config --global user.name ${GH_USER}
|
||||
|
||||
# Update submodule of auto-gen JSBinding repo.
|
||||
pushd "$GENERATED_WORKTREE"
|
||||
|
||||
|
|
Loading…
Reference in New Issue