generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GN: Fix build for Mac

Browse Source 
BUG=4105
R=henrika@webrtc.org, pbos@webrtc.org, perkj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/29269004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7961 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-12-19 13:28:37 +00:00
parent 11d8176cb3
commit 556caffb36
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/base/BUILD.gn
View File

@ -49,7 +49,7 @@ config("nss_config") {
} }
config("ios_config") { config("ios_config") {
ldflags = [ libs = [
#"Foundation.framework", # Already included in //build/config:default_libs. #"Foundation.framework", # Already included in //build/config:default_libs.
"Security.framework", "Security.framework",
"SystemConfiguration.framework", "SystemConfiguration.framework",
@ -58,7 +58,7 @@ config("ios_config") {
} }
config("mac_config") { config("mac_config") {
ldflags = [ libs = [
"Cocoa.framework", "Cocoa.framework",
#"Foundation.framework", # Already included in //build/config:default_libs. #"Foundation.framework", # Already included in //build/config:default_libs.
#"IOKit.framework", # Already included in //build/config:default_libs. #"IOKit.framework", # Already included in //build/config:default_libs.

5
webrtc/modules/audio_device/mac/audio_device_mac.h
View File

@ -11,6 +11,7 @@
#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" #include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
@ -180,12 +181,12 @@ private:
virtual int32_t MicrophoneIsAvailable(bool& available); virtual int32_t MicrophoneIsAvailable(bool& available);
virtual int32_t SpeakerIsAvailable(bool& available); virtual int32_t SpeakerIsAvailable(bool& available);
void Lock() void Lock() EXCLUSIVE_LOCK_FUNCTION(_critSect)
{ {
_critSect.Enter(); _critSect.Enter();
} }
; ;
void UnLock() void UnLock() UNLOCK_FUNCTION(_critSect)
{ {
_critSect.Leave(); _critSect.Leave();
} }

8
webrtc/modules/desktop_capture/BUILD.gn
View File

@ -109,6 +109,14 @@ source_set("desktop_capture") {
] ]
} }
if (is_mac) {
libs = [
"AppKit.framework",
"IOKit.framework",
"OpenGL.framework",
]
}
configs += [ "../..:common_config" ] configs += [ "../..:common_config" ]
public_configs = [ "../..:common_inherited_config"] public_configs = [ "../..:common_inherited_config"]

5
webrtc/modules/video_render/mac/video_render_nsopengl.h
View File

@ -22,6 +22,7 @@
#include <list> #include <list>
#include <map> #include <map>
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/video_render/include/video_render_defines.h" #include "webrtc/modules/video_render/include/video_render_defines.h"
#import "webrtc/modules/video_render/mac/cocoa_full_screen_window.h" #import "webrtc/modules/video_render/mac/cocoa_full_screen_window.h"
@ -119,8 +120,8 @@ public: // methods
bool HasChannels(); bool HasChannels();
bool HasChannel(int channel); bool HasChannel(int channel);
int GetChannels(std::list<int>& channelList); int GetChannels(std::list<int>& channelList);
void LockAGLCntx(); void LockAGLCntx() EXCLUSIVE_LOCK_FUNCTION(_nsglContextCritSec);
void UnlockAGLCntx(); void UnlockAGLCntx() UNLOCK_FUNCTION(_nsglContextCritSec);
// ********** new module functions ************ // // ********** new module functions ************ //
int ChangeWindow(CocoaRenderView* newWindowRef); int ChangeWindow(CocoaRenderView* newWindowRef);