danog/libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/libtgvoip.git synced 2024-11-30 04:39:03 +01:00
Code Issues Projects Releases Wiki Activity

Fixed build on old OS X

Browse Source
This commit is contained in:
Grishka 2019-03-12 20:35:42 +03:00
parent d81253009d
commit b6ac291101
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libtgvoip.gyp
View File

@ -102,14 +102,6 @@
'<(tgvoip_src_loc)/os/darwin/AudioUnitIO.h',
'<(tgvoip_src_loc)/os/darwin/DarwinSpecific.mm',
'<(tgvoip_src_loc)/os/darwin/DarwinSpecific.h',
'<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.mm',
'<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.h',
'<(tgvoip_src_loc)/os/darwin/TGVVideoSource.mm',
'<(tgvoip_src_loc)/os/darwin/TGVVideoSource.h',
'<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.mm',
'<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.h',
'<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.mm',
'<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.h',
# Linux
'<(tgvoip_src_loc)/os/linux/AudioInputALSA.cpp',
@ -780,6 +772,9 @@
'/usr/local/macold/include/c++/v1',
'<(DEPTH)/../../../Libraries/macold/openssl/include',
],
'defines': [
'TARGET_OSX32',
],
}, {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.8',
@ -788,13 +783,23 @@
'include_dirs': [
'<(DEPTH)/../../../Libraries/openssl/include',
],
'direct_dependent_settings': {
'linkflags': [
'-framework VideoToolbox',
],
},
'sources': [
'<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.mm',
'<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.h',
'<(tgvoip_src_loc)/os/darwin/TGVVideoSource.mm',
'<(tgvoip_src_loc)/os/darwin/TGVVideoSource.h',
'<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.mm',
'<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.h',
'<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.mm',
'<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.h',
],
}]
],
'direct_dependent_settings': {
'linkflags': [
'-framework VideoToolbox',
],
},
},
],
[

4
video/VideoRenderer.cpp
View File

@ -6,7 +6,7 @@
#ifdef __ANDROID__
#include "../os/android/VideoRendererAndroid.h"
#elif defined(__APPLE__)
#elif defined(__APPLE__) && !defined(TARGET_OSX32)
#include "../os/darwin/SampleBufferDisplayLayerRenderer.h"
#endif
@ -22,7 +22,7 @@ std::vector<uint32_t> tgvoip::video::VideoRenderer::GetAvailableDecoders(){
int tgvoip::video::VideoRenderer::GetMaximumResolution(){
#ifdef __ANDROID__
return VideoRendererAndroid::maxResolution;
#elif defined(__APPLE__)
#elif defined(__APPLE__) && !defined(TARGET_OSX32)
return SampleBufferDisplayLayerRenderer::GetMaximumResolution();
#endif
return 0;

4
video/VideoSource.cpp
View File

@ -6,7 +6,7 @@
#ifdef __ANDROID__
#include "../os/android/VideoSourceAndroid.h"
#elif defined(__APPLE__)
#elif defined(__APPLE__) && !defined(TARGET_OSX32)
#include "../os/darwin/VideoToolboxEncoderSource.h"
#endif
@ -37,7 +37,7 @@ std::string VideoSource::GetErrorDescription(){
std::vector<uint32_t> VideoSource::GetAvailableEncoders(){
#ifdef __ANDROID__
return VideoSourceAndroid::availableEncoders;
#elif defined(__APPLE__)
#elif defined(__APPLE__) && !defined(TARGET_OSX32)
return VideoToolboxEncoderSource::GetAvailableEncoders();
#endif
return std::vector<uint32_t>();