diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-01-02 13:06:18 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-01-03 10:34:10 +0800 |
| commit | d0b797fbf45f3cec923b22f93b61e86a1f867844 (patch) | |
| tree | ca50ad676a575daf3c98843633d381f94c40382a /ndk-build.cmd | |
| parent | b41244d7679724866700ac6a4757f34c43e928e2 (diff) | |
| download | ndk-d0b797fbf45f3cec923b22f93b61e86a1f867844.tar.gz | |
Misc fixes for 64-bit Windows toolchain
Change-Id: Idaf7d93dfd031e40b7b005805e71688f079e94ac
Diffstat (limited to 'ndk-build.cmd')
| -rw-r--r-- | ndk-build.cmd | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ndk-build.cmd b/ndk-build.cmd index 262cecf45..45dd31c92 100644 --- a/ndk-build.cmd +++ b/ndk-build.cmd @@ -1,7 +1,7 @@ @echo off rem This is a Windows cmd.exe script used to invoke the NDK-specific GNU Make executable set NDK_ROOT=%~dp0 -set NDK_MAKE=%NDK_ROOT%/prebuilt/windows/bin/make.exe +set NDK_MAKE=%NDK_ROOT%\prebuilt\windows-x86_64\bin\make.exe rem Check if %NDK_ROOT% contains space goto :L @@ -14,4 +14,8 @@ goto :L call :FOO %NDK_ROOT% if ERRORLEVEL 1 exit /b 1 -%NDK_ROOT%\prebuilt\windows\bin\make.exe -f %NDK_ROOT%build/core/build-local.mk SHELL=cmd %* +rem Check if 64-bit make exists and Windows is also 64-bit +if "%ProgramW6432%"=="" set NDK_MAKE=%NDK_ROOT%\prebuilt\windows\bin\make.exe +if not exist %NDK_MAKE% set NDK_MAKE=%NDK_ROOT%\prebuilt\windows\bin\make.exe + +%NDK_MAKE% -f %NDK_ROOT%build/core/build-local.mk SHELL=cmd %* |