diff options
author | tkchin@webrtc.org <tkchin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-30 22:26:06 +0000 |
---|---|---|
committer | tkchin@webrtc.org <tkchin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-30 22:26:06 +0000 |
commit | acca675bcf8fefd1d1985ea3d0fb8f9ea65f5d4a (patch) | |
tree | 62511f1ba41e95e4693ddc22830ceaa95d73f4bc /talk/libjingle_examples.gyp | |
parent | 9f8164c06054016978378b7a01a9180106d92771 (diff) | |
download | webrtc-acca675bcf8fefd1d1985ea3d0fb8f9ea65f5d4a.tar.gz |
Implement mac version of AppRTCDemo.
- Refactored and moved AppRTCDemo to support sharing AppRTC connection code between iOS and mac counterparts.
- Refactored OpenGL rendering code to be shared between iOS and mac counterparts.
- iOS AppRTCDemo now respects video aspect ratio.
BUG=2168
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17589004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6291 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/libjingle_examples.gyp')
-rwxr-xr-x | talk/libjingle_examples.gyp | 65 |
1 files changed, 48 insertions, 17 deletions
diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp index dc8b653230..6d3dcffe42 100755 --- a/talk/libjingle_examples.gyp +++ b/talk/libjingle_examples.gyp @@ -218,7 +218,7 @@ ], # targets }], # OS=="linux" or OS=="win" - ['OS=="ios"', { + ['OS=="ios" or (OS=="mac" and mac_sdk>="10.8")', { 'targets': [ { 'target_name': 'AppRTCDemo', @@ -226,40 +226,71 @@ 'product_name': 'AppRTCDemo', 'mac_bundle': 1, 'mac_bundle_resources': [ - 'examples/ios/AppRTCDemo/ResourceRules.plist', - 'examples/ios/AppRTCDemo/en.lproj/APPRTCViewController.xib', - 'examples/ios/AppRTCDemo/ios_channel.html', - 'examples/ios/Icon.png', + 'examples/objc/AppRTCDemo/channel.html', ], 'dependencies': [ 'libjingle.gyp:libjingle_peerconnection_objc', ], 'conditions': [ + ['OS=="ios"', { + 'mac_bundle_resources': [ + 'examples/objc/AppRTCDemo/ios/ResourceRules.plist', + 'examples/objc/AppRTCDemo/ios/en.lproj/APPRTCViewController.xib', + 'examples/objc/Icon.png', + ], + 'sources': [ + 'examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h', + 'examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.m', + 'examples/objc/AppRTCDemo/ios/APPRTCViewController.h', + 'examples/objc/AppRTCDemo/ios/APPRTCViewController.m', + 'examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch', + 'examples/objc/AppRTCDemo/ios/main.m', + ], + 'xcode_settings': { + 'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/ios/Info.plist', + }, + }], + ['OS=="mac"', { + 'sources': [ + 'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.h', + 'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m', + 'examples/objc/AppRTCDemo/mac/APPRTCViewController.h', + 'examples/objc/AppRTCDemo/mac/APPRTCViewController.m', + 'examples/objc/AppRTCDemo/mac/main.m', + ], + 'xcode_settings': { + 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO', + 'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/mac/Info.plist', + 'MACOSX_DEPLOYMENT_TARGET' : '10.8', + 'OTHER_LDFLAGS': [ + '-framework AVFoundation', + '-framework WebKit', + ], + }, + }], ['target_arch=="ia32"', { 'dependencies' : [ '<(DEPTH)/testing/iossim/iossim.gyp:iossim#host', ], }], ], + 'include_dirs': [ + 'examples/objc/APPRTCDemo', + ], 'sources': [ - 'examples/ios/AppRTCDemo/APPRTCAppClient.h', - 'examples/ios/AppRTCDemo/APPRTCAppClient.m', - 'examples/ios/AppRTCDemo/APPRTCAppDelegate.h', - 'examples/ios/AppRTCDemo/APPRTCAppDelegate.m', - 'examples/ios/AppRTCDemo/APPRTCViewController.h', - 'examples/ios/AppRTCDemo/APPRTCViewController.m', - 'examples/ios/AppRTCDemo/AppRTCDemo-Prefix.pch', - 'examples/ios/AppRTCDemo/GAEChannelClient.h', - 'examples/ios/AppRTCDemo/GAEChannelClient.m', - 'examples/ios/AppRTCDemo/main.m', + 'examples/objc/AppRTCDemo/APPRTCAppClient.h', + 'examples/objc/AppRTCDemo/APPRTCAppClient.m', + 'examples/objc/AppRTCDemo/APPRTCConnectionManager.h', + 'examples/objc/AppRTCDemo/APPRTCConnectionManager.m', + 'examples/objc/AppRTCDemo/GAEChannelClient.h', + 'examples/objc/AppRTCDemo/GAEChannelClient.m', ], 'xcode_settings': { 'CLANG_ENABLE_OBJC_ARC': 'YES', - 'INFOPLIST_FILE': 'examples/ios/AppRTCDemo/Info.plist', }, }, # target AppRTCDemo ], # targets - }], # OS=="ios" + }], # OS=="ios" or (OS=="mac" and mac_sdk>="10.8") ['OS=="android"', { 'targets': [ |