diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e34c1b6..c86848a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,3 +78,69 @@ jobs: draft: true allowUpdates: true token: ${{ secrets.GH_TOKEN }} + + tinyphone_osx_job: + name: Build Tinyphone macOS + runs-on: macos-10.15 + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Checkout submodules # checkout rest + shell: bash + run: | + git config --global url."https://github.com/".insteadOf "git@github.com:" + auth_header="$(git config --local --get http.https://github.com/.extraheader)" + git submodule sync --recursive + git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + - name: Install dependencies + shell: bash + run : | + export HOMEBREW_NO_INSTALL_CLEANUP=true + brew install autoconf automake libtool tree wget opencore-amr + wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb + brew install --build-from-source -f cryptopp.rb + npm install -g appdmg + - name: Restore Boost Framework + uses: actions/cache@v2 + id: cache-boost + with: + path: vendor/boost + key: boost-osx + - name: Create Boost Framework + # if: steps.cache-boost.outputs.cache-hit != 'true' + run : | + #xcode needs to be proper at this point + xcode-select --print-path + + #boost + pushd tinyphone-osx/vendor/boost + ./boost.sh -macos --boost-version 1.68.0 + popd + + - name: Compile Libraries + run : | + #stastd + pushd lib/statsd-cpp + mkdir build-osx + cd build-osx + cmake .. + make + popd + + - name: Build Project + run : | + #xcode needs to be proper at this point + xcode-select --print-path + + pushd tinyphone-osx + pod install + xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + ./package.sh + + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: tinyphone.dmg + path: | + ./tinyphone-osx/tinyphone.dmg + diff --git a/tinyphone-osx/.gitignore b/tinyphone-osx/.gitignore index f4f9250..31d3035 100644 --- a/tinyphone-osx/.gitignore +++ b/tinyphone-osx/.gitignore @@ -25,3 +25,9 @@ DerivedData/ ## Gcc Patch /*.gcno *.dmg + + +#xcode +Pods/ +Tinyphone.xcworkspace/ + diff --git a/tinyphone-osx/Podfile b/tinyphone-osx/Podfile new file mode 100644 index 0000000..2624d56 --- /dev/null +++ b/tinyphone-osx/Podfile @@ -0,0 +1,10 @@ +platform :macos, '10.15' +use_frameworks! + +target 'Tinyphone' do + pod 'YbridOpus' + # pod 'libopus-static' + # pod 'pjsip', '~> 2.9.0.2' + pod 'pjsip', :git => 'https://github.com/voiceip/cocoapod-pjsip' , :branch => 'no-libopus' +end + diff --git a/tinyphone-osx/Podfile.lock b/tinyphone-osx/Podfile.lock new file mode 100644 index 0000000..e0ba66b --- /dev/null +++ b/tinyphone-osx/Podfile.lock @@ -0,0 +1,29 @@ +PODS: + - pjsip (2.9.0.2) + - YbridOpus (0.8.0) + +DEPENDENCIES: + - pjsip (from `https://github.com/voiceip/cocoapod-pjsip`, branch `no-libopus`) + - YbridOpus + +SPEC REPOS: + trunk: + - YbridOpus + +EXTERNAL SOURCES: + pjsip: + :branch: no-libopus + :git: https://github.com/voiceip/cocoapod-pjsip + +CHECKOUT OPTIONS: + pjsip: + :commit: 80a177661d3ec4bfe3aa6be2d2767c62871c4965 + :git: https://github.com/voiceip/cocoapod-pjsip + +SPEC CHECKSUMS: + pjsip: d74b5ea51bd4181581049de2833a61b060dd5063 + YbridOpus: e9af373b9b38acff3702d9a3bd97cae3c232887c + +PODFILE CHECKSUM: 33875e5fc3d98200609b13b063ae004b7b7b6c59 + +COCOAPODS: 1.11.3 diff --git a/tinyphone-osx/README.md b/tinyphone-osx/README.md new file mode 100644 index 0000000..0105d0a --- /dev/null +++ b/tinyphone-osx/README.md @@ -0,0 +1,23 @@ +# Building for macOS + +```bash +#install dependencies +brew install autoconf automake libtool opencore-amr cryptopp + +#build dependencies + +#boost +cd tinyphone-osx/vendor/boost +./boost.sh -macos --boost-version 1.68.0 + +#statsd +cd tinyphone/lib/statsd-cpp/build-osx +cmake .. +make + +#lets install the pods +pod install + +#now open the `Tinyphone.xcworkspace` file and compile! +``` + diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index 0d56826..c9a8992 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj +++ b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 6B07F5E2BD9B3AE651158F53 /* Pods_Tinyphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */; }; B3025C2025530D7E00C331CA /* Tinyphone-OC.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */; }; B327CAF32551784A0092FDB7 /* call.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAD2255178480092FDB7 /* call.cpp */; }; B327CAF52551784A0092FDB7 /* microtar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAD8255178480092FDB7 /* microtar.cpp */; }; @@ -18,57 +19,20 @@ B327CAFE2551784A0092FDB7 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAEE2551784A0092FDB7 /* utils.cpp */; }; B327CAFF2551784A0092FDB7 /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAF02551784A0092FDB7 /* net.cpp */; }; B327CB032551973A0092FDB7 /* libstatsd_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB01255195BD0092FDB7 /* libstatsd_static.a */; }; - B327CB0E2551A0130092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */; }; - B327CB0F2551A0350092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB04255197CC0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */; }; - B327CB102551A0410092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0C25519FFC0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */; }; - B327CB112551A0410092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0D25519FFC0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */; }; - B327CB122551A0410092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0A25519FFC0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */; }; - B327CB132551A0410092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0B25519FFC0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */; }; - B327CB142551A0410092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */; }; - B327CB1A2551A0530092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB162551A0510092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */; }; - B327CB1B2551A0530092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB172551A0510092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */; }; - B327CB1C2551A0530092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB152551A0510092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */; }; - B327CB1D2551A0530092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB182551A0510092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */; }; - B327CB1E2551A0530092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB192551A0510092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */; }; - B327CB202551A05E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB1F2551A05B0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */; }; - B327CB362551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB212551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */; }; - B327CB372551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB222551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a */; }; - B327CB382551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB232551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a */; }; - B327CB392551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB242551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */; }; - B327CB3A2551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB252551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a */; }; - B327CB3B2551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB262551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */; }; - B327CB3C2551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB272551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */; }; - B327CB3D2551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB282551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a */; }; - B327CB3E2551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB292551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */; }; - B327CB3F2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2A2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */; }; - B327CB402551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2B2551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */; }; - B327CB412551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2C2551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a */; }; - B327CB422551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2D2551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a */; }; - B327CB432551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2E2551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */; }; - B327CB442551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2F2551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */; }; - B327CB452551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB302551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a */; }; - B327CB462551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB312551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a */; }; - B327CB472551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB322551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a */; }; - B327CB482551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB332551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */; }; - B327CB492551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB342551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */; }; - B327CB4A2551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB352551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */; }; B327CB502551A2940092FDB7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB4D2551A2940092FDB7 /* CoreAudio.framework */; }; B327CB522551A2F40092FDB7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB512551A2F40092FDB7 /* AudioUnit.framework */; }; B327CB542551A2FD0092FDB7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB532551A2FD0092FDB7 /* AudioToolbox.framework */; }; - B33839072551C692000D6F04 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B33839062551C692000D6F04 /* libopus.a */; }; B33839092551D3EF000D6F04 /* osxapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B33839082551D3EF000D6F04 /* osxapp.cpp */; }; - B392C7A6255408B70068492F /* boost.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3B8EE172552A26D00B903D1 /* boost.xcframework */; }; - B392C7AB255409390068492F /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A8255409390068492F /* libboost_date_time.dylib */; }; - B392C7AC255409390068492F /* libboost_date_time.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A8255409390068492F /* libboost_date_time.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - B392C7AD255409390068492F /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A9255409390068492F /* libboost_filesystem.dylib */; }; - B392C7AE255409390068492F /* libboost_filesystem.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A9255409390068492F /* libboost_filesystem.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - B392C7AF255409390068492F /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7AA255409390068492F /* libboost_system.dylib */; }; - B392C7B0255409390068492F /* libboost_system.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7AA255409390068492F /* libboost_system.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + B36B645B27E30DB100B011C9 /* libopencore-amrnb.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */; }; + B36B645C27E30DB100B011C9 /* libopencore-amrwb.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */; }; B392C7B9255412560068492F /* libcryptopp.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7B8255412560068492F /* libcryptopp.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - B392C7BB255412770068492F /* libopus.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7BA255412770068492F /* libopus.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B39C3B442552C3CE00BBD999 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B39C3B432552C3CE00BBD999 /* libresolv.tbd */; }; B39C3B4B2552E1E700BBD999 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B39C3B4A2552E1E700BBD999 /* AppKit.framework */; }; + B3AD62C827E3174300F6A499 /* boost.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3B8EE172552A26D00B903D1 /* boost.xcframework */; }; + B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B3B92C3E2568152A0095EF2C /* mod_notify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3B92C3D2568152A0095EF2C /* mod_notify.cpp */; }; + B3C9365527E34ED300CE2CDB /* Pods_Tinyphone.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B3D53FC92551696600523D5F /* AccountsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3D53FC82551696600523D5F /* AccountsView.xib */; }; B3D53FCC255169CF00523D5F /* AccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D53FCB255169CF00523D5F /* AccountsView.swift */; }; B3D53FCE25516A4200523D5F /* LoadableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D53FCD25516A4200523D5F /* LoadableView.swift */; }; @@ -86,11 +50,10 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - B392C7BB255412770068492F /* libopus.0.dylib in Embed Frameworks */, + B3C9365527E34ED300CE2CDB /* Pods_Tinyphone.framework in Embed Frameworks */, + B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */, + B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */, B392C7B9255412560068492F /* libcryptopp.dylib in Embed Frameworks */, - B392C7AE255409390068492F /* libboost_filesystem.dylib in Embed Frameworks */, - B392C7AC255409390068492F /* libboost_date_time.dylib in Embed Frameworks */, - B392C7B0255409390068492F /* libboost_system.dylib in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -98,6 +61,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.release.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.release.xcconfig"; sourceTree = ""; }; + 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tinyphone.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.debug.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.debug.xcconfig"; sourceTree = ""; }; B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Tinyphone-OC.mm"; sourceTree = ""; }; B3025C1F25530D7E00C331CA /* Tinyphone-OC.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "Tinyphone-OC.hpp"; sourceTree = ""; }; B327CAD0255178470092FDB7 /* Tinyphone-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tinyphone-Bridging-Header.h"; sourceTree = ""; }; @@ -129,52 +95,16 @@ B327CAF02551784A0092FDB7 /* net.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = net.cpp; path = ../../tinyphone/net.cpp; sourceTree = ""; }; B327CAF12551784A0092FDB7 /* metrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = metrics.h; path = ../../tinyphone/metrics.h; sourceTree = ""; }; B327CB01255195BD0092FDB7 /* libstatsd_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstatsd_static.a; path = "../lib/statsd-cpp/build-osx/lib/libstatsd_static.a"; sourceTree = ""; }; - B327CB04255197CC0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpj-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjlib/lib/libpj-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua2-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsua2-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0A25519FFC0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsip-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0B25519FFC0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0C25519FFC0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-simple-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsip-simple-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0D25519FFC0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-ua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsip-ua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB152551A0510092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB162551A0510092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB172551A0510092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB182551A0510092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB192551A0510092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsdp-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjsdp-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB1F2551A05B0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjlib-util-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjlib-util/lib/libpjlib-util-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB212551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB222551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libyuv-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libyuv-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB232551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libresample-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libresample-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB242551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB252551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgsmcodec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libgsmcodec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB262551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsdp-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsdp-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB272551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsip-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB282551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libilbccodec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libilbccodec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB292551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-ua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsip-ua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2A2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2B2551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua2-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsua2-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2C2551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libspeex-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libspeex-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2D2551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjnath-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjnath-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2E2551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2F2551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpj-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpj-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB302551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwebrtc-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libwebrtc-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB312551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libg7221codec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libg7221codec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB322551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsrtp-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libsrtp-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB332551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-simple-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsip-simple-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB342551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjlib-util-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjlib-util-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB352551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; B327CB4B2551A2940092FDB7 /* CoreAudioTypes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioTypes.framework; path = System/Library/Frameworks/CoreAudioTypes.framework; sourceTree = SDKROOT; }; B327CB4C2551A2940092FDB7 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; B327CB4D2551A2940092FDB7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; B327CB512551A2F40092FDB7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; B327CB532551A2FD0092FDB7 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; B337E2C32554468C001696B7 /* config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = config.json; path = ../config.json; sourceTree = ""; }; - B33839062551C692000D6F04 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = ../lib/opus/libopus.a; sourceTree = ""; }; B33839082551D3EF000D6F04 /* osxapp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = osxapp.cpp; sourceTree = ""; }; - B392C7A8255409390068492F /* libboost_date_time.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_date_time.dylib; path = /usr/local/opt/boost/lib/libboost_date_time.dylib; sourceTree = ""; }; - B392C7A9255409390068492F /* libboost_filesystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_filesystem.dylib; path = /usr/local/opt/boost/lib/libboost_filesystem.dylib; sourceTree = ""; }; - B392C7AA255409390068492F /* libboost_system.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_system.dylib; path = /usr/local/opt/boost/lib/libboost_system.dylib; sourceTree = ""; }; + B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopencore-amrnb.0.dylib"; path = "/usr/local/opt/opencore-amr/lib/libopencore-amrnb.0.dylib"; sourceTree = ""; }; + B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopencore-amrwb.0.dylib"; path = "/usr/local/opt/opencore-amr/lib/libopencore-amrwb.0.dylib"; sourceTree = ""; }; B392C7B8255412560068492F /* libcryptopp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcryptopp.dylib; path = /usr/local/opt/cryptopp/lib/libcryptopp.dylib; sourceTree = ""; }; - B392C7BA255412770068492F /* libopus.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopus.0.dylib; path = /usr/local/opt/opus/lib/libopus.0.dylib; sourceTree = ""; }; B39C3B432552C3CE00BBD999 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; B39C3B4A2552E1E700BBD999 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; B39C3B562552EF1900BBD999 /* Tinyphone-C-Interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Tinyphone-C-Interface.h"; sourceTree = ""; }; @@ -201,51 +131,16 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B36B645B27E30DB100B011C9 /* libopencore-amrnb.0.dylib in Frameworks */, + B36B645C27E30DB100B011C9 /* libopencore-amrwb.0.dylib in Frameworks */, B39C3B4B2552E1E700BBD999 /* AppKit.framework in Frameworks */, B39C3B442552C3CE00BBD999 /* libresolv.tbd in Frameworks */, B327CB542551A2FD0092FDB7 /* AudioToolbox.framework in Frameworks */, B327CB522551A2F40092FDB7 /* AudioUnit.framework in Frameworks */, + B3AD62C827E3174300F6A499 /* boost.xcframework in Frameworks */, B327CB502551A2940092FDB7 /* CoreAudio.framework in Frameworks */, - B327CB1A2551A0530092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB1B2551A0530092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB122551A0410092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB362551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB372551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB382551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB392551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3A2551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3B2551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3C2551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3D2551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3E2551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3F2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB402551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7A6255408B70068492F /* boost.xcframework in Frameworks */, - B327CB412551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB422551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB432551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB442551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7AB255409390068492F /* libboost_date_time.dylib in Frameworks */, - B327CB452551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB462551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB472551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB482551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB492551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB4A2551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB202551A05E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7AF255409390068492F /* libboost_system.dylib in Frameworks */, - B327CB1C2551A0530092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB142551A0410092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB0E2551A0130092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB102551A0410092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB1E2551A0530092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB112551A0410092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB0F2551A0350092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB132551A0410092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB1D2551A0530092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7AD255409390068492F /* libboost_filesystem.dylib in Frameworks */, - B33839072551C692000D6F04 /* libopus.a in Frameworks */, B327CB032551973A0092FDB7 /* libstatsd_static.a in Frameworks */, + 6B07F5E2BD9B3AE651158F53 /* Pods_Tinyphone.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -255,6 +150,8 @@ 9EDB4E7B95299CB02F683BF7 /* Pods */ = { isa = PBXGroup; children = ( + 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */, + 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -270,7 +167,6 @@ B3025C1F25530D7E00C331CA /* Tinyphone-OC.hpp */, B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */, B39C3B562552EF1900BBD999 /* Tinyphone-C-Interface.h */, - B3B8EE192552A6D400B903D1 /* app.h */, B327CADE255178490092FDB7 /* account.cpp */, B327CAD4255178480092FDB7 /* account.h */, B327CAD2255178480092FDB7 /* call.cpp */, @@ -307,52 +203,16 @@ B327CB00255195BC0092FDB7 /* Frameworks */ = { isa = PBXGroup; children = ( - B392C7A8255409390068492F /* libboost_date_time.dylib */, - B392C7A9255409390068492F /* libboost_filesystem.dylib */, - B392C7AA255409390068492F /* libboost_system.dylib */, B39C3B4A2552E1E700BBD999 /* AppKit.framework */, B39C3B432552C3CE00BBD999 /* libresolv.tbd */, B3B8EE172552A26D00B903D1 /* boost.xcframework */, - B33839062551C692000D6F04 /* libopus.a */, B327CB532551A2FD0092FDB7 /* AudioToolbox.framework */, B327CB512551A2F40092FDB7 /* AudioUnit.framework */, B327CB4D2551A2940092FDB7 /* CoreAudio.framework */, B327CB4C2551A2940092FDB7 /* CoreAudioKit.framework */, B327CB4B2551A2940092FDB7 /* CoreAudioTypes.framework */, - B327CB1F2551A05B0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */, - B327CB162551A0510092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */, - B327CB312551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a */, - B327CB252551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a */, - B327CB282551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a */, - B327CB2F2551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */, - B327CB342551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */, - B327CB352551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */, - B327CB172551A0510092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */, - B327CB242551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */, - B327CB152551A0510092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */, - B327CB182551A0510092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */, - B327CB2E2551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */, - B327CB2D2551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a */, - B327CB192551A0510092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */, - B327CB0C25519FFC0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */, - B327CB332551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */, - B327CB0D25519FFC0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */, - B327CB292551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */, - B327CB0A25519FFC0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */, - B327CB0B25519FFC0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */, - B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */, - B327CB04255197CC0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */, - B327CB212551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */, - B327CB262551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */, - B327CB272551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */, - B327CB2A2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */, - B327CB2B2551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */, - B327CB232551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a */, - B327CB2C2551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a */, - B327CB322551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a */, - B327CB302551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a */, - B327CB222551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a */, B327CB01255195BD0092FDB7 /* libstatsd_static.a */, + 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */, ); name = Frameworks; sourceTree = ""; @@ -370,8 +230,9 @@ B3DDA55025515DF700D269C9 = { isa = PBXGroup; children = ( + B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */, + B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */, B337E2C32554468C001696B7 /* config.json */, - B392C7BA255412770068492F /* libopus.0.dylib */, B392C7B8255412560068492F /* libcryptopp.dylib */, B327CACF255178050092FDB7 /* src */, B3DDA55B25515DF700D269C9 /* tinyphone */, @@ -410,11 +271,13 @@ isa = PBXNativeTarget; buildConfigurationList = B3DDA56925515DF900D269C9 /* Build configuration list for PBXNativeTarget "Tinyphone" */; buildPhases = ( + 023F5C8B0DBB33BA59EBED3F /* [CP] Check Pods Manifest.lock */, B3DDA55525515DF700D269C9 /* Sources */, B3DDA55625515DF700D269C9 /* Frameworks */, B3DDA55725515DF700D269C9 /* Resources */, B327CB0825519E550092FDB7 /* Embed Frameworks */, - B392C7A52554035D0068492F /* ShellScript */, + B392C7A52554035D0068492F /* Run Script */, + 627FED5B7A017D9C4A84B04C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -432,7 +295,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1110; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1320; ORGANIZATIONNAME = "Kinshuk Bairagi"; TargetAttributes = { B3DDA55825515DF700D269C9 = { @@ -474,7 +337,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - B392C7A52554035D0068492F /* ShellScript */ = { + 023F5C8B0DBB33BA59EBED3F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -482,14 +345,54 @@ inputFileListPaths = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Tinyphone-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 627FED5B7A017D9C4A84B04C /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Tinyphone/Pods-Tinyphone-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Tinyphone/Pods-Tinyphone-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tinyphone/Pods-Tinyphone-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B392C7A52554035D0068492F /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script"; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nEXECFILE=${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\ndeclare -a TARGETS=(\"libcryptopp.dylib\" \"libopus.0.dylib\" \"libboost_filesystem.dylib\" \"libboost_system.dylib\" \"libboost_date_time.dylib\")\nfor TARGET in \"${TARGETS[@]}\" ; do\necho \"Running for $TARGET\"\nFULLTARGET=`otool -LD ${EXECFILE} | grep $TARGET | awk '{ print $1 }'`\necho $FULLTARGET\ninstall_name_tool -change ${FULLTARGET} \"@rpath/${TARGET}\" ${EXECFILE}\ndone\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nEXECFILE=${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\ndeclare -a TARGETS=(\"libcryptopp.dylib\" \"libopencore-amrnb.0.dylib\" \"libopencore-amrwb.0.dylib\") # \"libopus.0.dylib\"\nfor TARGET in \"${TARGETS[@]}\" ; do\necho \"Running for $TARGET\"\nFULLTARGET=`otool -LD ${EXECFILE} | grep $TARGET | awk '{ print $1 }'`\necho $FULLTARGET\ninstall_name_tool -change ${FULLTARGET} \"@rpath/${TARGET}\" ${EXECFILE}\ndone\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -557,6 +460,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -567,6 +471,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + EXCLUDED_ARCHS = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -597,7 +502,7 @@ ../lib/portaudio/include, ); LIBRARY_SEARCH_PATHS = /usr/local/lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -608,6 +513,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = 6; }; name = Debug; }; @@ -637,6 +543,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -647,6 +554,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_ARCHS = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -671,9 +579,10 @@ ../lib/portaudio/include, ); LIBRARY_SEARCH_PATHS = /usr/local/lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-lcryptopp", "-lcurl", @@ -681,11 +590,13 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = 6; }; name = Release; }; B3DDA56A25515DF900D269C9 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; @@ -703,24 +614,22 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( + "../lib/statsd-cpp/build-osx/lib", "$(inherited)", + "/usr/local/opt/opencore-amr/lib", /usr/local/lib, - "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", - /Volumes/Workspace/code/voice/tinyphone/lib/pjproject/lib, - /usr/local/Cellar/boost/1.72.0_3/lib, ); + MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 36.0.0.81; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DBOOST_SYSTEM_DYN_LINK", ); OTHER_LDFLAGS = ( + "$(inherited)", "-lcryptopp", "-lcurl", "-lpthread", - "-lboost_filesystem", - "-lboost_system", - "-lboost_date_time", ); PRODUCT_BUNDLE_IDENTIFIER = com.github.voiceip.tphone; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -728,11 +637,13 @@ SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 6; }; name = Debug; }; B3DDA56B25515DF900D269C9 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; @@ -749,30 +660,29 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( + "../lib/statsd-cpp/build-osx/lib", "$(inherited)", + "/usr/local/opt/opencore-amr/lib", /usr/local/lib, - "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", - /Volumes/Workspace/code/voice/tinyphone/lib/pjproject/lib, - /usr/local/Cellar/boost/1.72.0_3/lib, ); + MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 36.0.0.81; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DBOOST_SYSTEM_DYN_LINK", ); OTHER_LDFLAGS = ( + "$(inherited)", "-lcryptopp", "-lcurl", "-lpthread", - "-lboost_filesystem", - "-lboost_system", - "-lboost_date_time", ); PRODUCT_BUNDLE_IDENTIFIER = com.github.voiceip.tphone; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 6; }; name = Release; }; diff --git a/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme b/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme index caa126f..bdd8aa6 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme +++ b/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme @@ -1,10 +1,28 @@ + LastUpgradeVersion = "1320" + version = "1.7"> + + + + + + + + + + Bool func add(toView parentView: NSView) } diff --git a/tinyphone-osx/tinyphone/Info.plist b/tinyphone-osx/tinyphone/Info.plist index 7a3fd19..99ad014 100644 --- a/tinyphone-osx/tinyphone/Info.plist +++ b/tinyphone-osx/tinyphone/Info.plist @@ -20,6 +20,8 @@ $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) + LSApplicationCategoryType + public.app-category.utilities LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement diff --git a/tinyphone-osx/vendor/boost b/tinyphone-osx/vendor/boost index 1878bd3..c1fd07d 160000 --- a/tinyphone-osx/vendor/boost +++ b/tinyphone-osx/vendor/boost @@ -1 +1 @@ -Subproject commit 1878bd324c33c7b171c015efe4f92eab3bb18ea2 +Subproject commit c1fd07de22e8597c9bc57ba1290d7652faae874f