miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated makefiles to work with newer CrystaX NDK

Browse Source
This commit is contained in:
pelya
2011-07-28 15:39:23 +03:00
parent 68bb534c19
commit f3ce9cd045
17 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/Android.mk
View File

@@ -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))

8
project/jni/application/Android.mk
View File

@@ -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 \

0
project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so.52.99.1 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi-v7a/libavcore.so.0.16.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so.52.2.2 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so.1.69.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so.52.88.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so.50.34.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so.0.12.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi/libavcodec.so.52.99.1 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi/libavcore.so.0.16.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi/libavdevice.so.52.2.2 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi/libavfilter.so.1.69.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi/libavformat.so.52.88.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi/libavutil.so.50.34.0 Executable file → Normal file
View File

0
project/jni/ffmpeg/lib/armeabi/libswscale.so.0.12.0 Executable file → Normal file
View File

4
project/jni/sdl-1.3/Android.mk
View File

@@ -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)