Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Makefile: fix libmatroska compilation

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2016-01-28 12:01:42 +01:00
parent 4f89dc65c7
commit 6ee24d9804
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -418,8 +418,8 @@ prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(
#Matroska2 #Matroska2
MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska-c
MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska-c
ifeq ($(BUILD_MATROSKA), 1) ifeq ($(BUILD_MATROSKA), 1)
prepare-matroska2: $(MATROSKA_SRC_DIR)/patch_applied.txt prepare-matroska2: $(MATROSKA_SRC_DIR)/patch_applied.txt
else else

2
jni/Android.mk
View file

@ -54,7 +54,7 @@ include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk
# Matroska # Matroska
ifeq ($(BUILD_MATROSKA), 1) ifeq ($(BUILD_MATROSKA), 1)
include $(linphone-root-dir)/submodules/externals/build/libmatroska/Android.mk include $(linphone-root-dir)/submodules/externals/build/libmatroska-c/Android.mk
endif endif
include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit f76447b43e3bbd31dfe6fdbe280e99e2aea73382 Subproject commit 77d350a949ad073de0718ab60b86c74930517f1b

2
submodules/externals/build/libmatroska/Android.mk → submodules/externals/build/libmatroska-c/Android.mk vendored
View file

@ -1,4 +1,4 @@
LOCAL_PATH:=$(call my-dir)/../../libmatroska LOCAL_PATH:=$(call my-dir)/../../libmatroska-c
include $(CLEAR_VARS) include $(CLEAR_VARS)

0
submodules/externals/build/libmatroska/fix_libmatroska2.patch → submodules/externals/build/libmatroska-c/fix_libmatroska2.patch vendored
View file

2
submodules/linphone

@ -1 +1 @@
Subproject commit b0ea18f83cd642243c5a2e1690d5cf95bfe55000 Subproject commit fdaca52ec4aa225670ee978ddfc7f5fe7cd9df9b