Mercurial > sdl-ios-xcode
changeset 4955:361ada59e3aa
Change from jlunder:
Minor configuration changes to smooth the build process, make it work on mac.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 04 Jan 2011 12:46:49 -0800 |
| parents | 144d9df7e611 |
| children | e0bd00bfd118 |
| files | Makefile.android android/config.cfg android/config.cfg.example |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.android Tue Jan 04 12:39:10 2011 -0800 +++ b/Makefile.android Tue Jan 04 12:46:49 2011 -0800 @@ -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
--- a/android/config.cfg Tue Jan 04 12:39:10 2011 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -ANDROID_NDK=/Users/hercules/tmp/android-ndk-r5
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/android/config.cfg.example Tue Jan 04 12:46:49 2011 -0800 @@ -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