forked from mirrors/linphone-iphone
first belle-sip version
This commit is contained in:
Jehan Monnier
parent
3d58d9b23c
commit
23a54227aa
21 changed files with 1008 additions and 569 deletions
8
.gitmodules
vendored
8
.gitmodules
vendored
|
|
@ -1,6 +1,6 @@
|
|||
[submodule "submodules/linphone"]
|
||||
path = submodules/linphone
|
||||
url = git://git.linphone.org/linphone.git
|
||||
url = git://git.linphone.org/linphone-private.git
|
||||
[submodule "submodules/externals/osip"]
|
||||
path = submodules/externals/osip
|
||||
url = git://git.linphone.org/osip.git
|
||||
|
|
@ -49,3 +49,9 @@
|
|||
[submodule "submodules/bcg729"]
|
||||
path = submodules/bcg729
|
||||
url = git://git.linphone.org/bcg729.git
|
||||
[submodule "submodules/belle-sip"]
|
||||
path = submodules/belle-sip
|
||||
url = gitosis@git.linphone.org:belle-sip
|
||||
[submodule "submodules/externals/antlr3"]
|
||||
path = submodules/externals/antlr3
|
||||
url = gitosis@git.linphone.org:antlr3
|
||||
|
|
|
|||
|
|
@ -308,8 +308,10 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
|
|||
[chat setState:[NSNumber numberWithInt:state]];
|
||||
[chat update];
|
||||
[thiz.tableController updateChatEntry:chat];
|
||||
linphone_chat_message_set_user_data(msg, NULL);
|
||||
[chat release]; // no longuer need to keep reference
|
||||
if (state != LinphoneChatMessageStateInProgress) {
|
||||
linphone_chat_message_set_user_data(msg, NULL);
|
||||
[chat release]; // no longuer need to keep reference
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -82,17 +82,17 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
|
|||
if (addr){
|
||||
const char *proxy=linphone_proxy_config_get_addr(cfg);
|
||||
LinphoneAddress *proxy_addr=linphone_address_new(proxy);
|
||||
const char *port=linphone_address_get_port(proxy_addr);
|
||||
int port=linphone_address_get_port_int(proxy_addr);
|
||||
|
||||
[self setString: linphone_address_get_username(addr) forKey:@"username_preference"];
|
||||
[self setString: linphone_address_get_domain(addr) forKey:@"domain_preference"];
|
||||
[self setInteger: linphone_proxy_config_get_expires(cfg) forKey:@"expire_preference"];
|
||||
[self setString: linphone_proxy_config_get_dial_prefix(cfg) forKey:@"prefix_preference"];
|
||||
if (strcmp(linphone_address_get_domain(addr),linphone_address_get_domain(proxy_addr))!=0
|
||||
|| port!=NULL){
|
||||
|| port>0){
|
||||
char tmp[256]={0};
|
||||
if (port!=NULL) {
|
||||
snprintf(tmp,sizeof(tmp)-1,"%s:%s",linphone_address_get_domain(proxy_addr),port);
|
||||
if (port>0) {
|
||||
snprintf(tmp,sizeof(tmp)-1,"%s:%i",linphone_address_get_domain(proxy_addr),port);
|
||||
}else snprintf(tmp,sizeof(tmp)-1,"%s",linphone_address_get_domain(proxy_addr));
|
||||
[self setString: tmp forKey:@"proxy_preference"];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,10 +12,7 @@
|
|||
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
|
||||
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
|
||||
22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; };
|
||||
220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; };
|
||||
220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; };
|
||||
220FAD3610765B400068D98F /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2D10765B400068D98F /* libosip2.a */; };
|
||||
220FAD3710765B400068D98F /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2E10765B400068D98F /* libosipparser2.a */; };
|
||||
220FAD3810765B400068D98F /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; };
|
||||
220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; };
|
||||
2214783D1386A2030020F8B8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; };
|
||||
|
|
@ -37,6 +34,10 @@
|
|||
2234C8EE15EE744200E18E83 /* chat_message_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */; };
|
||||
2234C8EF15EE744200E18E83 /* chat_message_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */; };
|
||||
2237D4091084D7A9001383EE /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* ring.wav */; };
|
||||
223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E416D9255800EF1BEC /* libantlr3c.a */; };
|
||||
223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E516D9255800EF1BEC /* libbellesip.a */; };
|
||||
223CA7E816D9256E00EF1BEC /* libantlr3c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E416D9255800EF1BEC /* libantlr3c.a */; };
|
||||
223CA7E916D9257200EF1BEC /* libbellesip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E516D9255800EF1BEC /* libbellesip.a */; };
|
||||
22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; };
|
||||
22405F001601C19200B92522 /* ImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageViewController.m */; };
|
||||
22405F011601C19200B92522 /* ImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageViewController.m */; };
|
||||
|
|
@ -87,17 +88,12 @@
|
|||
22D8F15D147548E2008C97DB /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; };
|
||||
22D8F15E147548E2008C97DB /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; };
|
||||
22D8F15F147548E2008C97DB /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; };
|
||||
22D8F163147548E2008C97DB /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; };
|
||||
22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; };
|
||||
22D8F165147548E2008C97DB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
|
||||
22D8F166147548E2008C97DB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
|
||||
22D8F167147548E2008C97DB /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
|
||||
22D8F168147548E2008C97DB /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; };
|
||||
22D8F169147548E2008C97DB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; };
|
||||
22D8F16A147548E2008C97DB /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; };
|
||||
22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; };
|
||||
22D8F16C147548E2008C97DB /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2D10765B400068D98F /* libosip2.a */; };
|
||||
22D8F16D147548E2008C97DB /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2E10765B400068D98F /* libosipparser2.a */; };
|
||||
22D8F16E147548E2008C97DB /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; };
|
||||
22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; };
|
||||
22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; };
|
||||
|
|
@ -117,8 +113,6 @@
|
|||
22E0A822111C44E100B04932 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* AboutViewController.m */; };
|
||||
22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; };
|
||||
22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; };
|
||||
22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; };
|
||||
22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; };
|
||||
22F2508E107141E100AC9B3F /* DialerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* DialerViewController.m */; };
|
||||
22F254811073D99800AC9B3F /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 22F254801073D99800AC9B3F /* ringback.wav */; };
|
||||
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
|
||||
|
|
@ -1458,11 +1452,8 @@
|
|||
220FACE9107654FC0068D98F /* speex_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_resampler.h; sourceTree = "<group>"; };
|
||||
220FACEA107654FC0068D98F /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = "<group>"; };
|
||||
220FACEB107654FC0068D98F /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = "<group>"; };
|
||||
220FAD2810765B400068D98F /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = "<group>"; };
|
||||
220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = "<group>"; };
|
||||
220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = "<group>"; };
|
||||
220FAD2D10765B400068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = "<group>"; };
|
||||
220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = "<group>"; };
|
||||
220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = "<group>"; };
|
||||
220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = "<group>"; };
|
||||
2211DB911475562600DEE054 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = "<group>"; };
|
||||
|
|
@ -1486,6 +1477,8 @@
|
|||
2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_not_delivered.png; path = Resources/chat_message_not_delivered.png; sourceTree = "<group>"; };
|
||||
2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_inprogress.png; path = Resources/chat_message_inprogress.png; sourceTree = "<group>"; };
|
||||
2237D4081084D7A9001383EE /* ring.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ring.wav; path = Resources/ring.wav; sourceTree = "<group>"; };
|
||||
223CA7E416D9255800EF1BEC /* libantlr3c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libantlr3c.a; path = "liblinphone-sdk/apple-darwin/lib/libantlr3c.a"; sourceTree = "<group>"; };
|
||||
223CA7E516D9255800EF1BEC /* libbellesip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbellesip.a; path = "liblinphone-sdk/apple-darwin/lib/libbellesip.a"; sourceTree = "<group>"; };
|
||||
22405EE916006F0700B92522 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = "<group>"; };
|
||||
22405EEA16006F0700B92522 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = "<group>"; };
|
||||
22405EED1600B4E400B92522 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
|
||||
|
|
@ -1603,8 +1596,6 @@
|
|||
22E0A81E111C44E100B04932 /* ConsoleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConsoleViewController.xib; sourceTree = "<group>"; };
|
||||
22E0A81F111C44E100B04932 /* ConsoleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConsoleViewController.m; sourceTree = "<group>"; };
|
||||
22E0A820111C44E100B04932 /* ConsoleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleViewController.h; sourceTree = "<group>"; };
|
||||
22E5B0AD133B5EA20044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = "<group>"; };
|
||||
22E5B0AE133B5EA20044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<group>"; };
|
||||
22F2508B107141E100AC9B3F /* DialerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DialerViewController.h; sourceTree = "<group>"; };
|
||||
22F2508C107141E100AC9B3F /* DialerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DialerViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
|
||||
22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = Resources/ringback.wav; sourceTree = "<group>"; };
|
||||
|
|
@ -2325,6 +2316,8 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */,
|
||||
223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */,
|
||||
D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */,
|
||||
D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */,
|
||||
22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */,
|
||||
|
|
@ -2351,9 +2344,7 @@
|
|||
22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */,
|
||||
22276E8313C73D3100210156 /* libavcodec.a in Frameworks */,
|
||||
22276E8413C73D3100210156 /* libavutil.a in Frameworks */,
|
||||
22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */,
|
||||
226CDADF14E2D0B800513B67 /* libbcg729.a in Frameworks */,
|
||||
220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */,
|
||||
220FAD3210765B400068D98F /* libgsm.a in Frameworks */,
|
||||
223148E41178A08200637D6A /* libilbc.a in Frameworks */,
|
||||
F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */,
|
||||
|
|
@ -2364,15 +2355,12 @@
|
|||
226183B0147259670037138E /* libmssilk.a in Frameworks */,
|
||||
22AA8AFE13D7125600B30535 /* libmsx264.a in Frameworks */,
|
||||
22A10F3B11F8960300373793 /* libortp.a in Frameworks */,
|
||||
220FAD3610765B400068D98F /* libosip2.a in Frameworks */,
|
||||
220FAD3710765B400068D98F /* libosipparser2.a in Frameworks */,
|
||||
226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */,
|
||||
226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */,
|
||||
226CDAE014E2D0B800513B67 /* libmsbcg729.a in Frameworks */,
|
||||
220FAD3810765B400068D98F /* libspeex.a in Frameworks */,
|
||||
220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */,
|
||||
226183AE1472527D0037138E /* libsrtp.a in Frameworks */,
|
||||
22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */,
|
||||
226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */,
|
||||
22276E8513C73D3100210156 /* libswscale.a in Frameworks */,
|
||||
7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */,
|
||||
|
|
@ -2405,8 +2393,6 @@
|
|||
22D8F166147548E2008C97DB /* UIKit.framework in Frameworks */,
|
||||
22D8F178147548E2008C97DB /* libresolv.dylib in Frameworks */,
|
||||
D34BD61515C13B7B0070C209 /* libsqlite3.dylib in Frameworks */,
|
||||
22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */,
|
||||
22D8F16A147548E2008C97DB /* libeXosip2.a in Frameworks */,
|
||||
22D8F174147548E2008C97DB /* libilbc.a in Frameworks */,
|
||||
22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */,
|
||||
D34BD61815C13D0B0070C209 /* liblinphone.a in Frameworks */,
|
||||
|
|
@ -2417,14 +2403,13 @@
|
|||
22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */,
|
||||
22D8F17A147548E2008C97DB /* libopencore-amrnb.a in Frameworks */,
|
||||
22D8F177147548E2008C97DB /* libortp.a in Frameworks */,
|
||||
22D8F16C147548E2008C97DB /* libosip2.a in Frameworks */,
|
||||
22D8F16D147548E2008C97DB /* libosipparser2.a in Frameworks */,
|
||||
22D8F17E147548E2008C97DB /* libSKP_SILK_SDK.a in Frameworks */,
|
||||
22D8F17F147548E2008C97DB /* libsrtp.a in Frameworks */,
|
||||
22D8F16E147548E2008C97DB /* libspeex.a in Frameworks */,
|
||||
22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */,
|
||||
22D8F163147548E2008C97DB /* libssl.a in Frameworks */,
|
||||
22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */,
|
||||
223CA7E816D9256E00EF1BEC /* libantlr3c.a in Frameworks */,
|
||||
223CA7E916D9257200EF1BEC /* libbellesip.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -2885,12 +2870,12 @@
|
|||
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
223CA7E416D9255800EF1BEC /* libantlr3c.a */,
|
||||
223CA7E516D9255800EF1BEC /* libbellesip.a */,
|
||||
2258633C11410BAC00C5A737 /* README */,
|
||||
22276E8013C73D3100210156 /* libavcodec.a */,
|
||||
22276E8113C73D3100210156 /* libavutil.a */,
|
||||
226CDADD14E2D0B800513B67 /* libbcg729.a */,
|
||||
22E5B0AE133B5EA20044EA25 /* libcrypto.a */,
|
||||
220FAD2810765B400068D98F /* libeXosip2.a */,
|
||||
220FAD2910765B400068D98F /* libgsm.a */,
|
||||
223148E31178A08200637D6A /* libilbc.a */,
|
||||
2211DB911475562600DEE054 /* liblinphone.a */,
|
||||
|
|
@ -2904,13 +2889,10 @@
|
|||
226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */,
|
||||
226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */,
|
||||
220FAD2C10765B400068D98F /* libortp.a */,
|
||||
220FAD2D10765B400068D98F /* libosip2.a */,
|
||||
220FAD2E10765B400068D98F /* libosipparser2.a */,
|
||||
226183AA1472527D0037138E /* libSKP_SILK_SDK.a */,
|
||||
220FAD2F10765B400068D98F /* libspeex.a */,
|
||||
220FAD3010765B400068D98F /* libspeexdsp.a */,
|
||||
226183AB1472527D0037138E /* libsrtp.a */,
|
||||
22E5B0AD133B5EA20044EA25 /* libssl.a */,
|
||||
22276E8213C73D3100210156 /* libswscale.a */,
|
||||
7066FC0B13E830E400EFC6DC /* libvpx.a */,
|
||||
22AA8AFB13D7125500B30535 /* libx264.a */,
|
||||
|
|
@ -5673,7 +5655,7 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
|
||||
GCC_THUMB_SUPPORT = NO;
|
||||
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
|
|
@ -5681,7 +5663,7 @@
|
|||
HEADER_SEARCH_PATHS = "";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
|
||||
LIBRARY_SEARCH_PATHS = "";
|
||||
PROVISIONING_PROFILE = "";
|
||||
PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C";
|
||||
SDKROOT = iphoneos;
|
||||
STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
|
|
|
|||
1
submodules/belle-sip
Submodule
1
submodules/belle-sip
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit d5d4a0243a48f9207b4c478051dc74d35eeaadb0
|
||||
|
|
@ -30,13 +30,15 @@ linphone_configure_controls= \
|
|||
--enable-gtk_ui=no \
|
||||
--enable-console_ui=no \
|
||||
--enable-ssl-hmac=no \
|
||||
--enable-ssl=yes \
|
||||
--enable-ssl=no \
|
||||
--disable-theora \
|
||||
--disable-sdl \
|
||||
--disable-x11 \
|
||||
--enable-bellesip \
|
||||
--with-gsm=$(prefix) \
|
||||
--disable-tests \
|
||||
--with-srtp=$(prefix)
|
||||
--with-srtp=$(prefix) \
|
||||
--with-antlr=$(prefix)
|
||||
|
||||
ifeq ($(enable_zrtp),yes)
|
||||
linphone_configure_controls+= --enable-zrtp
|
||||
|
|
@ -109,17 +111,17 @@ veryclean: veryclean-linphone veryclean-msbcg729
|
|||
rm -rf $(BUILDER_BUILD_DIR)
|
||||
|
||||
|
||||
.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile
|
||||
.NOTPARALLEL build-linphone: init build-libantlr build-belle-sip build-srtp build-zrtpcpp build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile
|
||||
cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install
|
||||
|
||||
clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264
|
||||
clean-linphone: clean-libantlr clean-belle-sip clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264
|
||||
cd $(LINPHONE_BUILD_DIR) && make clean
|
||||
|
||||
veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx
|
||||
veryclean-linphone: veryclean-libantlrc3 veryclean-belle-sip veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx
|
||||
#-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-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk
|
||||
clean-makefile-linphone: clean-makefile-libantlr clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk
|
||||
cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile
|
||||
|
||||
|
||||
|
|
@ -146,54 +148,6 @@ clean-makefile-liblinphone:
|
|||
|
||||
clean-liblinphone:
|
||||
cd $(LINPHONE_BUILD_DIR) && make clean
|
||||
#osip2
|
||||
|
||||
$(BUILDER_SRC_DIR)/$(osip_dir)/configure:
|
||||
cd $(BUILDER_SRC_DIR)/$(osip_dir) && ./autogen.sh
|
||||
|
||||
$(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(osip_dir)/configure
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(osip_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir)/ \
|
||||
&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(osip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
|
||||
|
||||
build-osip2: $(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
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
|
||||
|
||||
clean-makefile-osip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(osip_dir) && rm -f Makefile
|
||||
#eXosip
|
||||
|
||||
$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure:
|
||||
cd $(BUILDER_SRC_DIR)/$(eXosip_dir) && ./autogen.sh
|
||||
|
||||
$(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(eXosip_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)/\
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --enable-openssl --disable-tools
|
||||
|
||||
build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
make DEFS="-DHAVE_CONFIG_H -include $(BUILDER_SRC_DIR)/$(eXosip_dir)/include/eXosip2/eXosip_transport_hook.h" && make install
|
||||
|
||||
clean-eXosip2:
|
||||
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make clean
|
||||
|
||||
veryclean-eXosip2:
|
||||
# -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
|
||||
|
||||
#speex
|
||||
|
||||
|
|
|
|||
43
submodules/build/builders.d/belle-sip.mk
Normal file
43
submodules/build/builders.d/belle-sip.mk
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
############################################################################
|
||||
# belle-sip.mk
|
||||
# Copyright (C) 2013 Belledonne Communications,Grenoble France
|
||||
#
|
||||
############################################################################
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
############################################################################
|
||||
belle-sip_dir?=belle-sip
|
||||
$(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure:
|
||||
cd $(BUILDER_SRC_DIR)/$(belle-sip_dir) && ./autogen.sh
|
||||
|
||||
$(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(belle-sip_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/ \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --disable-tls
|
||||
|
||||
build-belle-sip: $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-belle-sip:
|
||||
cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && make clean
|
||||
|
||||
veryclean-belle-sip:
|
||||
-cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && make distclean
|
||||
rm -f $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure
|
||||
|
||||
clean-makefile-belle-sip:
|
||||
cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && rm -f Makefile
|
||||
|
|
@ -34,7 +34,7 @@ $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak: $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/
|
|||
&& $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/configure --prefix=$(prefix) $(ffmpeg_configure_options)
|
||||
|
||||
build-ffmpeg: $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak
|
||||
cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-ffmpeg:
|
||||
cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make clean
|
||||
|
|
|
|||
43
submodules/build/builders.d/libantlr3c.mk
Normal file
43
submodules/build/builders.d/libantlr3c.mk
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
############################################################################
|
||||
# libantlr.mk
|
||||
# Copyright (C) 2013 Belledonne Communications,Grenoble France
|
||||
#
|
||||
############################################################################
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
############################################################################
|
||||
libantlr_dir?=externals/antlr3/runtime/C
|
||||
$(BUILDER_SRC_DIR)/$(libantlr_dir)/configure:
|
||||
cd $(BUILDER_SRC_DIR)/$(libantlr_dir) && ./autogen.sh
|
||||
|
||||
$(BUILDER_BUILD_DIR)/$(libantlr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(libantlr_dir)/configure
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(libantlr_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(libantlr_dir)/ \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(libantlr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
|
||||
|
||||
build-libantlr: $(BUILDER_BUILD_DIR)/$(libantlr_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-libantlr:
|
||||
cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && make clean
|
||||
|
||||
veryclean-libantlr:
|
||||
-cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && make distclean
|
||||
rm -f $(BUILDER_SRC_DIR)/$(libantlr_dir)/configure
|
||||
|
||||
clean-makefile-libantlr:
|
||||
cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && rm -f Makefile
|
||||
|
|
@ -27,7 +27,7 @@ $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/p
|
|||
&& SYSROOT_PATH=$$SYSROOT_PATH SDK_BIN_PATH=$$SDK_BIN_PATH $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) $(libvpx_configure_options)
|
||||
|
||||
build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk
|
||||
cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-libvpx:
|
||||
cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make clean
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ $(BUILDER_SRC_DIR)/$(msamr_dir)/configure:
|
|||
$(BUILDER_BUILD_DIR)/$(msamr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msamr_dir)/configure
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(msamr_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(msamr_dir)/ \
|
||||
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(msamr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
|
||||
|
||||
build-msamr: build-opencore-amr $(BUILDER_BUILD_DIR)/$(msamr_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-msamr: clean-opencore-amr
|
||||
cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make clean
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ $(BUILDER_BUILD_DIR)/$(msbcg729_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msbcg729_dir
|
|||
@echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(msbcg729_dir) \033[0m"
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(msbcg729_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(msbcg729_dir)/ \
|
||||
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(msbcg729_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \
|
||||
--enable-static
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ ifeq ($(enable_bcg729),yes)
|
|||
build-msbcg729: $(BUILDER_BUILD_DIR)/$(msbcg729_dir)/Makefile
|
||||
@echo -e "\033[01;32m building bcg729 \033[0m"
|
||||
cd $(BUILDER_BUILD_DIR)/$(msbcg729_dir) \
|
||||
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig \
|
||||
CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
make -j1 && make install
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/co
|
|||
echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m"
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \
|
||||
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \
|
||||
--enable-static
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ ifeq ($(enable_silk),yes)
|
|||
build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile
|
||||
echo -e "\033[01;32m building silk \033[0m"
|
||||
cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \
|
||||
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig \
|
||||
CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
make -j1 && make install
|
||||
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ $(BUILDER_SRC_DIR)/$(msx264_dir)/configure:
|
|||
$(BUILDER_BUILD_DIR)/$(msx264_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msx264_dir)/configure
|
||||
mkdir -p $(BUILDER_BUILD_DIR)/$(msx264_dir)
|
||||
cd $(BUILDER_BUILD_DIR)/$(msx264_dir)/ \
|
||||
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
|
||||
$(BUILDER_SRC_DIR)/$(msx264_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
|
||||
|
||||
build-msx264: build-x264 $(BUILDER_BUILD_DIR)/$(msx264_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(msx264_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
cd $(BUILDER_BUILD_DIR)/$(msx264_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-msx264: clean-x264
|
||||
cd $(BUILDER_BUILD_DIR)/$(msx264_dir) && make clean
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore
|
|||
$(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${opencore-amr-configure-option}
|
||||
|
||||
build-opencore-amr: $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile
|
||||
cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install
|
||||
|
||||
clean-opencore-amr:
|
||||
cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ fi
|
|||
|
||||
for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ;
|
||||
echo "Selecting SDK path = ${SYSROOT_PATH}"
|
||||
COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS"
|
||||
COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions"
|
||||
CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS"
|
||||
OBJC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS"
|
||||
CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS"
|
||||
|
|
|
|||
1
submodules/externals/antlr3
vendored
Submodule
1
submodules/externals/antlr3
vendored
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 5ed4fec737f88c69da3192871fb2553bffe46bfa
|
||||
1
submodules/externals/libantlr3c
vendored
Submodule
1
submodules/externals/libantlr3c
vendored
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit eb738fb406d2b75e7e94457da800c38d8bfc3c71
|
||||
1
submodules/libantlr3c
Submodule
1
submodules/libantlr3c
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit eb738fb406d2b75e7e94457da800c38d8bfc3c71
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
|||
Subproject commit a8f757be70c4a1af8477c038aae155bef7b474b7
|
||||
Subproject commit 0b06ac3fb57e7e4453c6ee3be79663011f4bd3b0
|
||||
Loading…
Add table
Reference in a new issue