ndk-build.cmd · 7a9c37698a1e2cdd865b5db7b14f9781cb696da6 · halo / ndk

Better way to detect 64-bit windows · 1078ff9b

Andrew Hsieh authored Apr 19, 2013

In windows ndk-build.cmd assumes windows is 64-bit unless one or more
of the following happens:

1. NDK_HOST_32BIT is set to 1 or true
2. prebuilt\windows-x86_64\bin\make.exe doesn't exist
3. Environment variable "ProgramW6432" doesn't exist

It appears that 64-bit Vista doesn't define "ProgramW6432" at all.
It seems that env. var. "ProgramFiles(x86)" is defined more consistently
in 64-bit windows, but 64-bit WINE defines "ProgramW6432" but not
"ProgramFiles(x86)".

So, the proposed solution is to change rule 3 in the above to

3'. Both environment variables "ProgramW6432" and "ProgramFiles(x86)"
    don't exist

See https://code.google.com/p/android/issues/detail?id=54485

Change-Id: I61c3026f3f33ec81dfce05fa4b1cb7abb741a477

1078ff9b

ndk-build.cmd 826 Bytes

Replace ndk-build.cmd