mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix Android makefiles for audio build

Browse source
This commit is contained in:
Simon Morlat 2013-09-16 16:48:20 +02:00
parent 5c88a8dd21
commit a1ec7d6965
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/android/Android-no-neon.mk
View file

@ -25,7 +25,7 @@ include $(CLEAR_VARS)
include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
ifeq ($(LINPHONE_VIDEO),1)
ifeq ($(_BUILD_VIDEO),1)
LOCAL_SHARED_LIBRARIES += \
liblinavcodecnoneon \
liblinswscale \

2
build/android/Android.mk
View file

@ -25,7 +25,7 @@ include $(CLEAR_VARS)
include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
ifeq ($(LINPHONE_VIDEO),1)
ifeq ($(_BUILD_VIDEO),1)
LOCAL_SHARED_LIBRARIES += \
liblinavcodec \
liblinswscale \

9
build/android/common.mk
View file

@ -74,14 +74,11 @@ LOCAL_CFLAGS += \
LOCAL_CFLAGS += -DIN_LINPHONE
ifeq ($(LINPHONE_VIDEO),1)
LOCAL_CFLAGS += -DVIDEO_ENABLED
ifeq ($(_BUILD_VIDEO),1)
LOCAL_CFLAGS += -DVIDEO_ENABLED -DENABLE_HD
ifeq ($(BUILD_X264),1)
LOCAL_CFLAGS += -DHAVE_X264
endif
ifeq ($(LINPHONE_HD_VIDEO),1)
LOCAL_CFLAGS += -DENABLE_HD
endif
endif
ifeq ($(USE_JAVAH),1)
@ -157,7 +154,7 @@ LOCAL_SHARED_LIBRARIES += libbcg729
LOCAL_STATIC_LIBRARIES += libmsbcg729
endif
ifeq ($(LINPHONE_VIDEO),1)
ifeq ($(_BUILD_VIDEO),1)
LOCAL_LDLIBS += -lGLESv2
LOCAL_STATIC_LIBRARIES += libvpx
ifeq ($(BUILD_X264),1)

2
mediastreamer2

@ -1 +1 @@
Subproject commit 4d4137357d244681fcc714411345f77e03459bdf
Subproject commit ac5233ae16394d59cf4d9783a229f2adc2111b12