From f3ce9cd0457946b76ade49068e6a551974edc45b Mon Sep 17 00:00:00 2001 From: pelya Date: Thu, 28 Jul 2011 15:39:23 +0300 Subject: [PATCH] Updated makefiles to work with newer CrystaX NDK --- project/jni/Android.mk | 2 +- project/jni/application/Android.mk | 8 ++++---- .../ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 | Bin .../jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 | Bin .../ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 | Bin .../ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 | Bin .../ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 | Bin .../jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 | Bin .../jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 | Bin .../jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 | Bin project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 | Bin .../jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 | Bin .../jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 | Bin .../jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 | Bin project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 | Bin project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 | Bin project/jni/sdl-1.3/Android.mk | 4 ++++ 17 files changed, 9 insertions(+), 5 deletions(-) mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 mode change 100755 => 100644 project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 diff --git a/project/jni/Android.mk b/project/jni/Android.mk index 9174fa3c3..2aa2fdd2c 100644 --- a/project/jni/Android.mk +++ b/project/jni/Android.mk @@ -27,7 +27,7 @@ NDK_R5_TOOLCHAIN := 1 endif ifneq ($(findstring r5-crystax-1,$(NDK_VERSION)),) $(info Building with CrystaX r5 toolchain - wchar support enabled) -CRYSTAX_R5B3_TOOLCHAIN := 1 +CRYSTAX_R5_TOOLCHAIN := 1 endif NDK_PATH := $(shell dirname $(shell which ndk-build)) diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index 283d1b567..b63615f21 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -25,8 +25,8 @@ LOCAL_C_INCLUDES := ifeq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),) LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stlport/stlport endif -ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),) -LOCAL_C_INCLUDES += $(NDK_PATH)/sources/wchar-support/include +ifneq ($(CRYSTAX_R5_TOOLCHAIN),) +LOCAL_C_INCLUDES += $(NDK_PATH)/sources/crystax/include endif LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \ @@ -54,8 +54,8 @@ LOCAL_LDFLAGS := -Lobj/local/armeabi LOCAL_LDFLAGS += $(APPLICATION_ADDITIONAL_LDFLAGS) -ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),) -LOCAL_LDLIBS += -L$(NDK_PATH)/sources/wchar-support/libs/armeabi -lwchar_static +ifneq ($(CRYSTAX_R5_TOOLCHAIN),) +LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static endif LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 b/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 b/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 b/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 b/project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 b/project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 b/project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 b/project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 b/project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 b/project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 old mode 100755 new mode 100644 diff --git a/project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 b/project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 old mode 100755 new mode 100644 diff --git a/project/jni/sdl-1.3/Android.mk b/project/jni/sdl-1.3/Android.mk index 6760e5504..b32c0e2e5 100644 --- a/project/jni/sdl-1.3/Android.mk +++ b/project/jni/sdl-1.3/Android.mk @@ -58,4 +58,8 @@ LOCAL_SRC_FILES := $(foreach F, $(SDL_SRCS), $(addprefix $(dir $(F)),$(notdir $( LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog +ifneq ($(CRYSTAX_R5_TOOLCHAIN),) +LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static +endif + include $(BUILD_SHARED_LIBRARY)