From 9900ccba4de26bd87cbcaa3f65c2affb31ecab17 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Mon, 1 Dec 2014 11:15:56 +0800 Subject: [PATCH 1/2] Add support to clang3.4 because of using the ndk-r10c --- tools/tolua/genbindings.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/tolua/genbindings.py b/tools/tolua/genbindings.py index 89901ab552..611bc44036 100755 --- a/tools/tolua/genbindings.py +++ b/tools/tolua/genbindings.py @@ -77,9 +77,16 @@ def main(): if platform == 'win32': x86_llvm_path = os.path.abspath(os.path.join(ndk_root, 'toolchains/llvm-3.3/prebuilt', '%s' % cur_platform)) + if not os.path.exists(x86_llvm_path): + x86_llvm_path = os.path.abspath(os.path.join(ndk_root, 'toolchains/llvm-3.4/prebuilt', '%s' % cur_platform)) else: x86_llvm_path = os.path.abspath(os.path.join(ndk_root, 'toolchains/llvm-3.3/prebuilt', '%s-%s' % (cur_platform, 'x86'))) + if not os.path.exists(x86_llvm_path): + x86_llvm_path = os.path.abspath(os.path.join(ndk_root, 'toolchains/llvm-3.4/prebuilt', '%s-%s' % (cur_platform, 'x86'))) + x64_llvm_path = os.path.abspath(os.path.join(ndk_root, 'toolchains/llvm-3.3/prebuilt', '%s-%s' % (cur_platform, 'x86_64'))) + if not os.path.exists(x64_llvm_path): + x64_llvm_path = os.path.abspath(os.path.join(ndk_root, 'toolchains/llvm-3.4/prebuilt', '%s-%s' % (cur_platform, 'x86_64'))) if os.path.isdir(x86_llvm_path): llvm_path = x86_llvm_path From ef16a460e6a4902a40daba2ee239563fdb03020d Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Mon, 1 Dec 2014 11:16:40 +0800 Subject: [PATCH 2/2] Update bindings-generator submodule --- tools/bindings-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bindings-generator b/tools/bindings-generator index 62aa5ed9cb..3b956b46cc 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 62aa5ed9cb84f5d2784ae3332a29fc5a900cfb3f +Subproject commit 3b956b46cc683f81d69811b3016810c1a93ad5f1