diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2012-11-21 16:56:14 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:47:05 +0300 |
| commit | c408080c2712a08108368b8e981c81d006ab4fab (patch) | |
| tree | 0ce369671d4ec8906294ed75d81d908db2dcd4b3 /tools | |
| parent | 0062bf7895a005d47e548d17c398f9d27f3ef31b (diff) | |
[android][win] Android apk can be built with ant from GitBash console
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/aapt.exe | bin | 0 -> 128512 bytes | |||
| -rw-r--r-- | tools/autobuild/build.sh | 5 | ||||
| -rw-r--r-- | tools/autobuild/ndk_helper.sh | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tools/android/aapt.exe b/tools/android/aapt.exe Binary files differnew file mode 100644 index 0000000000..21e94a99dd --- /dev/null +++ b/tools/android/aapt.exe diff --git a/tools/autobuild/build.sh b/tools/autobuild/build.sh index e7004fd8a4..570b6bb72d 100644 --- a/tools/autobuild/build.sh +++ b/tools/autobuild/build.sh @@ -9,9 +9,12 @@ source "$LOCAL_DIRNAME/detect_qmake.sh" # Prints number of cores to stdout GetCPUCores() { case "$OSTYPE" in + # it's GitBash under Windows + msys) echo $NUMBER_OF_PROCESSORS + ;; linux-gnu) grep -c ^processor /proc/cpuinfo 2>/dev/null ;; - darwin*) sysctl -n hw.ncpu + darwin*) sysctl -n hw.ncpu ;; *) echo "Unsupported platform in $0" exit 1 diff --git a/tools/autobuild/ndk_helper.sh b/tools/autobuild/ndk_helper.sh index 6e52f2e8b3..ff15078856 100644 --- a/tools/autobuild/ndk_helper.sh +++ b/tools/autobuild/ndk_helper.sh @@ -27,6 +27,10 @@ GetNdkHost() echo "darwin-x86" return 0 fi - # TODO add Windows + if [[ "$OSTYPE" == "msys" ]]; then + echo windows + return 0 + fi + echo "ERROR: Can't detect your host OS" return 1 } |