Commit 70d602f3 authored by Romain Bertozzi's avatar Romain Bertozzi Committed by gerrit2

conf: update dependencies and pbxproj

This patch removes lresample dependencies and add missing one to
properly fit with the daemon:
- libboost_system.a
- libboost_random.a
- libcryptopp.a
- librestbed.a

It also updates the pbxproj file to integrate the new requirements
and fill our information in (team...)

Change-Id: Ibe53fa8edeaf43aa68eef7acd3f20060d4336344
Tuleap: #819
parent 2a9233a4
......@@ -7,6 +7,10 @@
objects = {
/* Begin PBXBuildFile section */
02419BCF1DC3E75700DF0734 /* libboost_random.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 02419BCD1DC3E75700DF0734 /* libboost_random.a */; };
02419BD01DC3E75700DF0734 /* libboost_system.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 02419BCE1DC3E75700DF0734 /* libboost_system.a */; };
02419BD21DC3E76A00DF0734 /* libcryptopp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 02419BD11DC3E76A00DF0734 /* libcryptopp.a */; };
02AED8191DD4C4B100F740BA /* librestbed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 02AED8181DD4C4B100F740BA /* librestbed.a */; };
043866211D218B1100E06CE2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 043866201D218B1100E06CE2 /* AudioToolbox.framework */; };
043866241D22C3BC00E06CE2 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043866231D22C3BC00E06CE2 /* Account.swift */; };
043866261D22C42F00E06CE2 /* AccountModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043866251D22C42F00E06CE2 /* AccountModel.swift */; };
......@@ -60,7 +64,6 @@
04399B021D1C341A00E99CD9 /* libpjsua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04399AD01D1C341A00E99CD9 /* libpjsua.a */; };
04399B031D1C341A00E99CD9 /* libpjsua2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04399AD11D1C341A00E99CD9 /* libpjsua2.a */; };
04399B041D1C341A00E99CD9 /* libpostproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04399AD21D1C341A00E99CD9 /* libpostproc.a */; };
04399B051D1C341A00E99CD9 /* libresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04399AD31D1C341A00E99CD9 /* libresample.a */; };
04399B061D1C341A00E99CD9 /* libring.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04399AD41D1C341A00E99CD9 /* libring.a */; };
04399B071D1C341A00E99CD9 /* libsamplerate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04399AD51D1C341A00E99CD9 /* libsamplerate.a */; };
04399B081D1C341A00E99CD9 /* libsndfile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04399AD61D1C341A00E99CD9 /* libsndfile.a */; };
......@@ -97,6 +100,10 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
02419BCD1DC3E75700DF0734 /* libboost_random.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_random.a; path = ../fat/lib/libboost_random.a; sourceTree = "<group>"; };
02419BCE1DC3E75700DF0734 /* libboost_system.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_system.a; path = ../fat/lib/libboost_system.a; sourceTree = "<group>"; };
02419BD11DC3E76A00DF0734 /* libcryptopp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcryptopp.a; path = ../fat/lib/libcryptopp.a; sourceTree = "<group>"; };
02AED8181DD4C4B100F740BA /* librestbed.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librestbed.a; path = ../DEPS/x86_64/lib/librestbed.a; sourceTree = "<group>"; };
043866201D218B1100E06CE2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
043866231D22C3BC00E06CE2 /* Account.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
043866251D22C42F00E06CE2 /* AccountModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountModel.swift; sourceTree = "<group>"; };
......@@ -160,7 +167,6 @@
04399AD01D1C341A00E99CD9 /* libpjsua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpjsua.a; path = ../fat/lib/libpjsua.a; sourceTree = "<group>"; };
04399AD11D1C341A00E99CD9 /* libpjsua2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpjsua2.a; path = ../fat/lib/libpjsua2.a; sourceTree = "<group>"; };
04399AD21D1C341A00E99CD9 /* libpostproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpostproc.a; path = ../fat/lib/libpostproc.a; sourceTree = "<group>"; };
04399AD31D1C341A00E99CD9 /* libresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libresample.a; path = ../fat/lib/libresample.a; sourceTree = "<group>"; };
04399AD41D1C341A00E99CD9 /* libring.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libring.a; path = ../fat/lib/libring.a; sourceTree = "<group>"; };
04399AD51D1C341A00E99CD9 /* libsamplerate.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsamplerate.a; path = ../fat/lib/libsamplerate.a; sourceTree = "<group>"; };
04399AD61D1C341A00E99CD9 /* libsndfile.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsndfile.a; path = ../fat/lib/libsndfile.a; sourceTree = "<group>"; };
......@@ -185,6 +191,10 @@
buildActionMask = 2147483647;
files = (
043866211D218B1100E06CE2 /* AudioToolbox.framework in Frameworks */,
02AED8191DD4C4B100F740BA /* librestbed.a in Frameworks */,
02419BD21DC3E76A00DF0734 /* libcryptopp.a in Frameworks */,
02419BCF1DC3E75700DF0734 /* libboost_random.a in Frameworks */,
02419BD01DC3E75700DF0734 /* libboost_system.a in Frameworks */,
04399AE41D1C341A00E99CD9 /* libavcodec.a in Frameworks */,
04399AE51D1C341A00E99CD9 /* libavdevice.a in Frameworks */,
04399AE61D1C341A00E99CD9 /* libavfilter.a in Frameworks */,
......@@ -216,7 +226,6 @@
04399B021D1C341A00E99CD9 /* libpjsua.a in Frameworks */,
04399B031D1C341A00E99CD9 /* libpjsua2.a in Frameworks */,
04399B041D1C341A00E99CD9 /* libpostproc.a in Frameworks */,
04399B051D1C341A00E99CD9 /* libresample.a in Frameworks */,
04399B061D1C341A00E99CD9 /* libring.a in Frameworks */,
04399B071D1C341A00E99CD9 /* libsamplerate.a in Frameworks */,
04399B081D1C341A00E99CD9 /* libsndfile.a in Frameworks */,
......@@ -258,6 +267,13 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
02AED8171DD4C4B000F740BA /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
043866221D22C38400E06CE2 /* Models */ = {
isa = PBXGroup;
children = (
......@@ -301,6 +317,7 @@
04399A0F1D1C2D9D00E99CD9 /* RingTests */,
04399A1A1D1C2D9D00E99CD9 /* RingUITests */,
043999F41D1C2D9D00E99CD9 /* Products */,
02AED8171DD4C4B000F740BA /* Frameworks */,
);
sourceTree = "<group>";
};
......@@ -353,6 +370,10 @@
04399A921D1C2E3600E99CD9 /* RING_DEPS */ = {
isa = PBXGroup;
children = (
02AED8181DD4C4B100F740BA /* librestbed.a */,
02419BD11DC3E76A00DF0734 /* libcryptopp.a */,
02419BCD1DC3E75700DF0734 /* libboost_random.a */,
02419BCE1DC3E75700DF0734 /* libboost_system.a */,
04399AB21D1C341A00E99CD9 /* libavcodec.a */,
04399AB31D1C341A00E99CD9 /* libavdevice.a */,
04399AB41D1C341A00E99CD9 /* libavfilter.a */,
......@@ -384,7 +405,6 @@
04399AD01D1C341A00E99CD9 /* libpjsua.a */,
04399AD11D1C341A00E99CD9 /* libpjsua2.a */,
04399AD21D1C341A00E99CD9 /* libpostproc.a */,
04399AD31D1C341A00E99CD9 /* libresample.a */,
04399AD41D1C341A00E99CD9 /* libring.a */,
04399AD51D1C341A00E99CD9 /* libsamplerate.a */,
04399AD61D1C341A00E99CD9 /* libsndfile.a */,
......@@ -500,7 +520,7 @@
TargetAttributes = {
043999F21D1C2D9D00E99CD9 = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 73LS4VP8J7;
DevelopmentTeam = KM95526DS8;
};
04399A0B1D1C2D9D00E99CD9 = {
CreatedOnToolsVersion = 7.3.1;
......@@ -722,15 +742,17 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = KM95526DS8;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../fat/include";
INFOPLIST_FILE = Ring/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../fat/lib";
PRODUCT_BUNDLE_IDENTIFIER = cx.ring.Ring;
PRODUCT_BUNDLE_IDENTIFIER = cx.ring;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "Ring/Ring-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
......@@ -742,14 +764,16 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = KM95526DS8;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../fat/include";
INFOPLIST_FILE = Ring/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../fat/lib";
PRODUCT_BUNDLE_IDENTIFIER = cx.ring.Ring;
PRODUCT_BUNDLE_IDENTIFIER = cx.ring;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "Ring/Ring-Bridging-Header.h";
SWIFT_VERSION = 2.3;
};
name = Release;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment