Ignore:
Timestamp:
Dec 28, 2016 3:40:07 AM (8 years ago)
Author:
nanang
Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:
pjproject/branches/projects/uwp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/uwp

  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj

    r5137 r5513  
    88 
    99/* Begin PBXBuildFile section */ 
     10                3A31F1B21DA4F568007C23A3 /* libwebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A31F1B11DA4F568007C23A3 /* libwebrtc.a */; }; 
    1011                3AA31FF618F3FB4C00112C3D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */; }; 
    1112                3AA31FF718F3FB4C00112C3D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */; }; 
     
    2122                3AA3200118F3FB4C00112C3D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */; }; 
    2223                3AA3200218F3FB4C00112C3D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF518F3FB4C00112C3D /* UIKit.framework */; }; 
     24                3AB0EC581DA76B39008A0F62 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AB0EC571DA76B39008A0F62 /* libc++.tbd */; }; 
    2325                3ADCCD171715338D0007BE8E /* pjsua.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ADCCD161715338D0007BE8E /* pjsua.png */; }; 
    2426                3ADCCD2D172E40120007BE8E /* pjsua_app_cli.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */; }; 
     
    3638                3AF0582516F050780046B835 /* ipjsuaViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AF0582316F050780046B835 /* ipjsuaViewController_iPhone.xib */; }; 
    3739                3AF0582816F050780046B835 /* ipjsuaViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AF0582616F050780046B835 /* ipjsuaViewController_iPad.xib */; }; 
    38                 3AFFF4DA19BD59AB0067F226 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AFFF4D919BD59AB0067F226 /* libstdc++.dylib */; }; 
    3940                E5E991E61B67A45500017E67 /* libg7221codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D41B67A45500017E67 /* libg7221codec.a */; }; 
    4041                E5E991E71B67A45500017E67 /* libgsmcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D51B67A45500017E67 /* libgsmcodec.a */; }; 
     
    5859 
    5960/* Begin PBXFileReference section */ 
     61                3A31F1B11DA4F568007C23A3 /* libwebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebrtc.a; sourceTree = "<group>"; }; 
    6062                3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 
    6163                3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 
     
    7173                3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 
    7274                3AA31FF518F3FB4C00112C3D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 
     75                3AB0EC571DA76B39008A0F62 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 
    7376                3ADCCD161715338D0007BE8E /* pjsua.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pjsua.png; sourceTree = "<group>"; }; 
    7477                3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_cli.c; path = ../../pjsua_app_cli.c; sourceTree = "<group>"; }; 
     
    9194                3AF0582416F050780046B835 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ipjsuaViewController_iPhone.xib; sourceTree = "<group>"; }; 
    9295                3AF0582716F050780046B835 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ipjsuaViewController_iPad.xib; sourceTree = "<group>"; }; 
    93                 3AFFF4D919BD59AB0067F226 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; }; 
    9496                E5E991D41B67A45500017E67 /* libg7221codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libg7221codec.a; sourceTree = "<group>"; }; 
    9597                E5E991D51B67A45500017E67 /* libgsmcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgsmcodec.a; sourceTree = "<group>"; }; 
     
    117119                        buildActionMask = 2147483647; 
    118120                        files = ( 
     121                                3AB0EC581DA76B39008A0F62 /* libc++.tbd in Frameworks */, 
    119122                                E5E991EC1B67A45500017E67 /* libpjmedia-codec.a in Frameworks */, 
    120                                 3AFFF4DA19BD59AB0067F226 /* libstdc++.dylib in Frameworks */, 
    121123                                3AA31FF818F3FB4C00112C3D /* CFNetwork.framework in Frameworks */, 
    122124                                E5E991E61B67A45500017E67 /* libg7221codec.a in Frameworks */, 
     
    144146                                3AA31FFC18F3FB4C00112C3D /* CoreMedia.framework in Frameworks */, 
    145147                                E5E991F21B67A45500017E67 /* libpjsip.a in Frameworks */, 
     148                                3A31F1B21DA4F568007C23A3 /* libwebrtc.a in Frameworks */, 
    146149                                E5E991F51B67A45500017E67 /* libresample.a in Frameworks */, 
    147150                                E5E991F61B67A45500017E67 /* libspeex.a in Frameworks */, 
     
    188191                        isa = PBXGroup; 
    189192                        children = ( 
     193                                3AB0EC571DA76B39008A0F62 /* libc++.tbd */, 
    190194                                3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */, 
    191195                                3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */, 
     
    238242                        isa = PBXGroup; 
    239243                        children = ( 
    240                                 3AFFF4D919BD59AB0067F226 /* libstdc++.dylib */, 
    241244                                E5E991D41B67A45500017E67 /* libg7221codec.a */, 
     245                                3A31F1B11DA4F568007C23A3 /* libwebrtc.a */, 
    242246                                E5E991D51B67A45500017E67 /* libgsmcodec.a */, 
    243247                                E5E991D61B67A45500017E67 /* libilbccodec.a */, 
     
    387391                                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 
    388392                                COPY_PHASE_STRIP = NO; 
     393                                ENABLE_BITCODE = NO; 
    389394                                GCC_C_LANGUAGE_STANDARD = gnu99; 
    390395                                GCC_DYNAMIC_NO_PIC = NO; 
     
    398403                                GCC_WARN_UNINITIALIZED_AUTOS = YES; 
    399404                                GCC_WARN_UNUSED_VARIABLE = YES; 
    400                                 IPHONEOS_DEPLOYMENT_TARGET = 6.0; 
     405                                IPHONEOS_DEPLOYMENT_TARGET = 7.0; 
    401406                                SDKROOT = iphoneos; 
    402407                                TARGETED_DEVICE_FAMILY = "1,2"; 
     
    415420                                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 
    416421                                COPY_PHASE_STRIP = YES; 
     422                                ENABLE_BITCODE = NO; 
    417423                                GCC_C_LANGUAGE_STANDARD = gnu99; 
    418424                                GCC_WARN_ABOUT_RETURN_TYPE = YES; 
    419425                                GCC_WARN_UNINITIALIZED_AUTOS = YES; 
    420426                                GCC_WARN_UNUSED_VARIABLE = YES; 
    421                                 IPHONEOS_DEPLOYMENT_TARGET = 6.0; 
     427                                IPHONEOS_DEPLOYMENT_TARGET = 7.0; 
    422428                                OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; 
    423429                                SDKROOT = iphoneos; 
Note: See TracChangeset for help on using the changeset viewer.