From 30951877941b9fcd18fdb6715f442c1058c7c1fe Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 7 Jun 2011 14:46:25 +0200 Subject: [PATCH 1/2] fix liblinphone xcode build --- linphone.xcodeproj/project.pbxproj | 43 ++++++------------- .../liblinphone.xcodeproj/project.pbxproj | 18 ++++---- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index fb7b5197d..e2c019e64 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -47,7 +47,6 @@ 2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; 2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; 2248E99F12F801C200220D9C /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E99E12F801C200220D9C /* LinphoneManager.m */; }; - 2252941412F6DAA400DD9BFB /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2B10765B400068D98F /* libmediastreamer.a */; }; 225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; }; 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; }; 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; @@ -225,7 +224,6 @@ 220FACEB107654FC0068D98F /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = ""; }; 220FAD2810765B400068D98F /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; 220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; - 220FAD2B10765B400068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = ""; }; 220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; 220FAD2D10765B400068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = ""; }; 220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = ""; }; @@ -426,7 +424,6 @@ 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */, 22A10F3B11F8960300373793 /* libortp.a in Frameworks */, 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */, - 2252941412F6DAA400DD9BFB /* libmediastreamer.a in Frameworks */, 226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */, 226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */, 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */, @@ -791,7 +788,6 @@ 223148E31178A08200637D6A /* libilbc.a */, 220FAD2810765B400068D98F /* libeXosip2.a */, 220FAD2910765B400068D98F /* libgsm.a */, - 220FAD2B10765B400068D98F /* libmediastreamer.a */, 220FAD2C10765B400068D98F /* libortp.a */, 220FAD2D10765B400068D98F /* libosip2.a */, 220FAD2E10765B400068D98F /* libosipparser2.a */, @@ -1046,20 +1042,15 @@ INFOPLIST_FILE = "linphone-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = ( - "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphoneos\"", - "$(inherited)", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=*]" = ( - "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphonesimulator\"", - "$(inherited)", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); OTHER_LDFLAGS = ( "-l", linphone, + "-l", + mediastreamer, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -1113,20 +1104,15 @@ INFOPLIST_FILE = "linphone-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = ( - "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphoneos\"", - "$(inherited)", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=*]" = ( - "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphonesimulator\"", - "$(inherited)", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); OTHER_LDFLAGS = ( "-l", linphone, + "-l", + mediastreamer, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -1180,20 +1166,15 @@ INFOPLIST_FILE = "linphone-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + "$(BUILT_PRODUCTS_DIR)", "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = ( - "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphoneos\"", - "$(inherited)", - ); - "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=*]" = ( - "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphonesimulator\"", - "$(inherited)", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); OTHER_LDFLAGS = ( "-l", linphone, + "-l", + mediastreamer, ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 06c7f1a2c..799c3075f 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -954,12 +954,12 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "_BYTE_ORDER=_LITTLE_ENDIAN\n", + "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE, - "LINPHONE_VERSION=\\\"Linphone-3.3.x\\\"", + "LINPHONE_VERSION=\\\"debug\\\"", "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", - "LOG_DOMAIN=\\\"Linphone\\\"\n", + "LOG_DOMAIN=\\\"Linphone\\\"", "ORTP_MAJOR_VERSION=0", "ORTP_MICRO_VERSION=0", "ORTP_MINOR_VERSION=15", @@ -969,6 +969,7 @@ IN_LINPHONE, __MACIOUNIT_ENABLED__, HAVE_EXOSIP_GET_SOCKET, + MS2_INTERNAL, ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -984,7 +985,7 @@ OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7"; + VALID_ARCHS = "armv6 armv7 i386"; }; name = Debug; }; @@ -994,12 +995,12 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = c99; GCC_PREPROCESSOR_DEFINITIONS = ( - "_BYTE_ORDER=_LITTLE_ENDIAN\n", + "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE, - "LINPHONE_VERSION=\\\"Linphone-3.3.x\\\"", + "LINPHONE_VERSION=\\\"debug\\\"", "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", - "LOG_DOMAIN=\\\"Linphone\\\"\n", + "LOG_DOMAIN=\\\"Linphone\\\"", "ORTP_MAJOR_VERSION=0", "ORTP_MICRO_VERSION=0", "ORTP_MINOR_VERSION=15", @@ -1009,6 +1010,7 @@ IN_LINPHONE, __MACIOUNIT_ENABLED__, HAVE_EXOSIP_GET_SOCKET, + MS2_INTERNAL, ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -1024,7 +1026,7 @@ OTHER_LDFLAGS = "-ObjC"; PREBINDING = NO; SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7"; + VALID_ARCHS = "armv6 armv7 i386"; }; name = Release; }; From db866e00abb38343c018f4df6e277b5715cb7741 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 16 Jun 2011 16:18:41 +0200 Subject: [PATCH 2/2] add make veryclean target fix tcp incoming call update libilbc submodule --- submodules/build/Makefile | 5 ++++ submodules/build/builder-iphone-os.mk | 30 +++++++++++---------- submodules/build/builders.d/msamr.mk | 3 ++- submodules/build/builders.d/opencore-amr.mk | 4 +-- submodules/libilbc-rfc3951 | 2 +- submodules/linphone | 2 +- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 0b6b48f02..9c2e11552 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -32,3 +32,8 @@ clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ && make -f builder-iphone-os.mk clean-makefile \ && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile + +veryclean: + make -f builder-iphone-simulator.mk veryclean \ + && make -f builder-iphone-os.mk veryclean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 89565a6ad..91bbfaf7d 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -77,7 +77,7 @@ init: mkdir -p $(prefix)/include mkdir -p $(prefix)/lib -veryclean: +veryclean: veryclean-linphone rm -rf $(BUILDER_BUILD_DIR) .NOTPARALLEL build-linphone: init build-openssl build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile @@ -86,9 +86,9 @@ veryclean: clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc clean-openssl clean-msamr cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr - cd $(LINPHONE_BUILD_DIR) && make distclean - cd $(LINPHONE_SRC_DIR) && rm -f configure +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr +#-cd $(LINPHONE_BUILD_DIR) && make distclean + -cd $(LINPHONE_SRC_DIR) && rm -f configure clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile @@ -132,8 +132,8 @@ clean-osip2: cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make clean veryclean-osip2: - cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean - cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure +# -cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean + -cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure clean-makefile-osip2: cd $(BUILDER_BUILD_DIR)/$(osip_dir) && rm -f Makefile @@ -157,7 +157,8 @@ clean-eXosip2: cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make clean veryclean-eXosip2: - cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean +# -cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean + -rm -f $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure clean-makefile-eXosip2: cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && rm -f Makefile @@ -181,7 +182,8 @@ clean-speex: cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make clean veryclean-speex: - cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean +# -cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean + -rm -f $(BUILDER_SRC_DIR)/$(speex_dir)/configure clean-makefile-speex: cd $(BUILDER_BUILD_DIR)/$(speex_dir) && rm -f Makefile @@ -201,8 +203,8 @@ clean-libgsm: cd $(BUILDER_BUILD_DIR)/$(gsm_dir)\ && make clean -veryclean-libgsm: clean-libgsm - cd $(BUILDER_BUILD_DIR)/$(gsm_dir)) \ +veryclean-libgsm: + -cd $(BUILDER_BUILD_DIR)/$(gsm_dir) \ && make uninstall @@ -225,8 +227,8 @@ clean-msilbc: cd $(MSILBC_BUILD_DIR) && make clean veryclean-msilbc: - cd $(MSILBC_BUILD_DIR) && make distclean - cd $(MSILBC_BUILD_DIR) && rm configure +# -cd $(MSILBC_BUILD_DIR) && make distclean + -cd $(MSILBC_SRC_DIR) && rm configure clean-makefile-msilbc: cd $(MSILBC_BUILD_DIR) && rm -f Makefile @@ -249,8 +251,8 @@ clean-libilbc: cd $(LIBILBC_BUILD_DIR) && make clean veryclean-libilbc: - cd $(LIBILBC_BUILD_DIR) && make distclean - cd $(LIBILBC_BUILD_DIR) && rm -f configure +# -cd $(LIBILBC_BUILD_DIR) && make distclean + -cd $(MSILBC_SRC_DIR) && rm -f configure clean-makefile-libilbc: cd $(LIBILBC_BUILD_DIR) && rm -f Makefile diff --git a/submodules/build/builders.d/msamr.mk b/submodules/build/builders.d/msamr.mk index d251a01c7..47c4ef460 100644 --- a/submodules/build/builders.d/msamr.mk +++ b/submodules/build/builders.d/msamr.mk @@ -36,7 +36,8 @@ clean-msamr: clean-opencore-amr cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make clean veryclean-msamr: veryclean-opencore-amr - cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make distclean && rm -f configure + -cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make distclean + rm -rf $(BUILDER_BUILD_DIR)/$(msamr_dir) clean-makefile-msamr: clean-makefile-opencore-amr cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && rm -f Makefile diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk index 14eddd265..99eb76438 100644 --- a/submodules/build/builders.d/opencore-amr.mk +++ b/submodules/build/builders.d/opencore-amr.mk @@ -37,8 +37,8 @@ clean-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean veryclean-opencore-amr: - cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make distclean - cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) && rm -f configure + -cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make distclean + -rm -rf $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) clean-makefile-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && rm -f Makefile diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951 index 2f7640d57..8af11e23e 160000 --- a/submodules/libilbc-rfc3951 +++ b/submodules/libilbc-rfc3951 @@ -1 +1 @@ -Subproject commit 2f7640d571fa12f75d269eda59d91e2037f99c5d +Subproject commit 8af11e23e482c98a40e5661c16974b297a0d0396 diff --git a/submodules/linphone b/submodules/linphone index 9a2914c42..8ba552ab6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9a2914c429330ef06fadecd6691fccf55e3ade0a +Subproject commit 8ba552ab693cb648947defac468cd31c311dbad3