Change from jlunder:
authorSam Lantinga <slouken@libsdl.org>
Tue, 04 Jan 2011 12:46:49 -0800
changeset 4955361ada59e3aa
parent 4954 144d9df7e611
child 4956 e0bd00bfd118
Change from jlunder:
Minor configuration changes to smooth the build process, make it work on mac.
Makefile.android
android/config.cfg
android/config.cfg.example
     1.1 --- a/Makefile.android	Tue Jan 04 12:39:10 2011 -0800
     1.2 +++ b/Makefile.android	Tue Jan 04 12:46:49 2011 -0800
     1.3 @@ -1,8 +1,8 @@
     1.4  # Makefile to build the SDL library
     1.5  
     1.6 -include ./android/config.cfg #get ANDROID_NDK
     1.7 +include ./android/config.cfg #get ANDROID_NDK, ANDROID_NDK_HOST
     1.8  
     1.9 -TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/darwin-x86/bin
    1.10 +TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
    1.11  ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include 
    1.12  INCLUDE = -I./include
    1.13  CFLAGS  = -g -O2 -fno-short-enums $(INCLUDE) $(ANDROID_INCLUDES) -DANDROID -DANDROID_NDK -static
     2.1 --- a/android/config.cfg	Tue Jan 04 12:39:10 2011 -0800
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,1 +0,0 @@
     2.4 -ANDROID_NDK=/Users/hercules/tmp/android-ndk-r5
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/android/config.cfg.example	Tue Jan 04 12:46:49 2011 -0800
     3.3 @@ -0,0 +1,4 @@
     3.4 +# This file sets up paths needed to find the NDK build tools.
     3.5 +# Edit it appropriately for your configuration and save it as "config.cfg".
     3.6 +ANDROID_NDK := </absolute/path/to/android/ndk>
     3.7 +ANDROID_NDK_HOST := <host-os> # "linux-x86" for linux, "darwin-x86" for mac