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

Fixed ffmpeg compilation

Browse Source
This commit is contained in:
pelya
2011-06-06 18:37:11 +03:00
parent 6539e814fb
commit b9d026762d
3 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
project/jni/ffmpeg/Android.mk
View File

@@ -1,15 +1,24 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
FFMPEG_MODULE := avcodec
include $(LOCAL_PATH)/ffmpeg.mk include $(CLEAR_VARS)
FFMPEG_MODULE := avcore
include $(LOCAL_PATH)/ffmpeg.mk LOCAL_MODULE := $(notdir $(LOCAL_PATH))
FFMPEG_MODULE := avdevice #ifeq ($(LOCAL_MODULE),ffmpeg)
include $(LOCAL_PATH)/ffmpeg.mk #$(error Do not use "ffmpeg" as dependency, use avformat, swscale etc)
FFMPEG_MODULE := avfilter #endif
include $(LOCAL_PATH)/ffmpeg.mk
FFMPEG_MODULE := avformat LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
include $(LOCAL_PATH)/ffmpeg.mk
FFMPEG_MODULE := avutil ifneq ($(NDK_R5_TOOLCHAIN),)
include $(LOCAL_PATH)/ffmpeg.mk LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
FFMPEG_MODULE := swscale include $(PREBUILT_SHARED_LIBRARY)
include $(LOCAL_PATH)/ffmpeg.mk else
LOCAL_SRC_FILES := dummy.c
include $(BUILD_SHARED_LIBRARY)
$(abspath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LOCAL_MODULE).so): $(LOCAL_PATH)/lib/armeabi/lib$(LOCAL_MODULE).so OVERRIDE_CUSTOM_LIB
cp -f $< $@
$(abspath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/lib$(LOCAL_MODULE).so): $(LOCAL_PATH)/lib/armeabi-v7a/lib$(LOCAL_MODULE).so OVERRIDE_CUSTOM_LIB
cp -f $< $@
.PHONY: OVERRIDE_CUSTOM_LIB
OVERRIDE_CUSTOM_LIB:
endif

7
project/jni/ffmpeg/dummy.c Normal file
View File

@@ -0,0 +1,7 @@
int
SDL_main(int argc, char *argv[])
{
return 0;
}

21
project/jni/ffmpeg/ffmpeg.mk
View File

@@ -1,21 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := $(FFMPEG_MODULE)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
ifneq ($(NDK_R5_TOOLCHAIN),)
LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/$(FFMPEG_MODULE).so
include $(PREBUILT_SHARED_LIBRARY)
else
LOCAL_SRC_FILES := dummy.c
include $(BUILD_SHARED_LIBRARY)
$(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libboost_$(FFMPEG_MODULE).so): lib/armeabi/$(FFMPEG_MODULE).so OVERRIDE_CUSTOM_LIB
cp -f $< $@
$(realpath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/libboost_$(FFMPEG_MODULE).so): lib/armeabi-v7a/$(FFMPEG_MODULE).so OVERRIDE_CUSTOM_LIB
cp -f $< $@
.PHONY: OVERRIDE_CUSTOM_LIB
OVERRIDE_CUSTOM_LIB:
endif