fix liblinphone xcode build

This commit is contained in:
Jehan Monnier 2011-06-07 14:46:25 +02:00
parent 0416e6d41b
commit 3095187794
2 changed files with 22 additions and 39 deletions

View file

@ -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 = "<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>"; };
220FAD2B10765B400068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer.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>"; };
@ -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*]" = "";

View file

@ -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;
};