Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5173 from lihex/issue#3781 

Don't set a default PYTHON_ROOT & NDK_ROOT for user on Windows
This commit is contained in:
James Chen 2014-01-22 19:22:24 -08:00
parent 3829a1aa46 ecdd64a889
commit 8bcdb0ace0
3 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit ad6f6c781687b0dd471c4df53c0ba5925e43894d Subproject commit 71690550b5fcfcbcf3928adb0e8579fbbcd317a9

28
tools/tojs/genbindings-win32.bat
View File

@ -1,11 +1,28 @@
@echo off @echo off
:: This script is used to generate jsbinding glue codes. :: This script is used to generate jsbinding glue codes.
:: You should modify PYTHON_ROOT and NDK_ROOT to work under your environment. :: Android ndk version must be ndk-r9b.
:: Android ndk version must be at least ndk-r9b.
set PYTHON_ROOT=C:/Python27 setlocal
set NDK_ROOT=G:/android/android-ndk-r9b :: You should modify PYTHON_ROOT and NDK_ROOT to work under your environment.
:: or just uncomment the follow 2 lines and set them.
:: set PYTHON_ROOT=C:/Python27
:: set NDK_ROOT=G:/android/android-ndk-r9b
setlocal ENABLEEXTENSIONS
if %errorlevel% neq 0 (
echo Unable to enable extensions
goto QUIT
)
if defined PYTHON_ROOT (echo PYTHON_ROOT is defined.) else (
echo PYTHON_ROOT is NOT defined!
goto QUIT)
if defined NDK_ROOT (echo NDK_ROOT is defined.) else (
echo NDK_ROOT is NOT defined!
goto QUIT)
set NDK_LLVM_ROOT=%NDK_ROOT%/toolchains/llvm-3.3/prebuilt/windows-x86_64 set NDK_LLVM_ROOT=%NDK_ROOT%/toolchains/llvm-3.3/prebuilt/windows-x86_64
set COCOS2DX_ROOT=%cd%/../.. set COCOS2DX_ROOT=%cd%/../..
@ -81,8 +98,9 @@ goto QUIT
echo --------------------------------- echo ---------------------------------
echo Generating bindings fails. echo Generating bindings fails.
echo --------------------------------- echo ---------------------------------
endlocal
:QUIT :QUIT
pause pause
endlocal

30
tools/tolua/genbindings-win32.bat
View File

@ -1,11 +1,28 @@
@echo off @echo off
:: This script is used to generate luabinding glue codes. :: This script is used to generate jsbinding glue codes.
:: You should modify PYTHON_ROOT and NDK_ROOT to work under your environment. :: Android ndk version must be ndk-r9b.
:: Android ndk version must be at least ndk-r9b.
set PYTHON_ROOT=C:/Python27 setlocal
set NDK_ROOT=G:/android/android-ndk-r9b :: You should modify PYTHON_ROOT and NDK_ROOT to work under your environment.
:: or just uncomment the follow 2 lines and set them.
:: set PYTHON_ROOT=C:/Python27
:: set NDK_ROOT=G:/android/android-ndk-r9b
setlocal ENABLEEXTENSIONS
if %errorlevel% neq 0 (
echo Unable to enable extensions
goto QUIT
)
if defined PYTHON_ROOT (echo PYTHON_ROOT is defined.) else (
echo PYTHON_ROOT is NOT defined!
goto QUIT)
if defined NDK_ROOT (echo NDK_ROOT is defined.) else (
echo NDK_ROOT is NOT defined!
goto QUIT)
set NDK_LLVM_ROOT=%NDK_ROOT%/toolchains/llvm-3.3/prebuilt/windows-x86_64 set NDK_LLVM_ROOT=%NDK_ROOT%/toolchains/llvm-3.3/prebuilt/windows-x86_64
set COCOS2DX_ROOT=%cd%/../.. set COCOS2DX_ROOT=%cd%/../..
@ -82,8 +99,9 @@ goto QUIT
echo --------------------------------- echo ---------------------------------
echo Generating bindings fails. echo Generating bindings fails.
echo --------------------------------- echo ---------------------------------
endlocal
:QUIT :QUIT
pause pause
endlocal