From 35ad67610831e126a21d9c5a770b878392795af6 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 4 Jan 2011 12:46:49 -0800
Subject: [PATCH] Change from jlunder: Minor configuration changes to smooth
 the build process, make it work on mac.

---
 Makefile.android           | 4 ++--
 android/config.cfg         | 1 -
 android/config.cfg.example | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 android/config.cfg
 create mode 100644 android/config.cfg.example

diff --git a/Makefile.android b/Makefile.android
index d17714668..bd41a46a3 100755
--- a/Makefile.android
+++ b/Makefile.android
@@ -1,8 +1,8 @@
 # Makefile to build the SDL library
 
-include ./android/config.cfg #get ANDROID_NDK
+include ./android/config.cfg #get ANDROID_NDK, ANDROID_NDK_HOST
 
-TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/darwin-x86/bin
+TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
 ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include 
 INCLUDE = -I./include
 CFLAGS  = -g -O2 -fno-short-enums $(INCLUDE) $(ANDROID_INCLUDES) -DANDROID -DANDROID_NDK -static
diff --git a/android/config.cfg b/android/config.cfg
deleted file mode 100644
index 1d821b47a..000000000
--- a/android/config.cfg
+++ /dev/null
@@ -1 +0,0 @@
-ANDROID_NDK=/Users/hercules/tmp/android-ndk-r5
diff --git a/android/config.cfg.example b/android/config.cfg.example
new file mode 100644
index 000000000..beb0e688d
--- /dev/null
+++ b/android/config.cfg.example
@@ -0,0 +1,4 @@
+# This file sets up paths needed to find the NDK build tools.
+# Edit it appropriately for your configuration and save it as "config.cfg".
+ANDROID_NDK := </absolute/path/to/android/ndk>
+ANDROID_NDK_HOST := <host-os> # "linux-x86" for linux, "darwin-x86" for mac