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

Use <(libs_loc) opus only on Windows.

Browse Source
This commit is contained in:
John Preston 2019-11-18 11:44:18 +03:00
parent 782436c567
commit 14df80f181
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpusDecoder.cpp
View File

@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <algorithm> #include <algorithm>
#ifdef HAVE_CONFIG_H #if defined HAVE_CONFIG_H || defined TGVOIP_USE_INSTALLED_OPUS
#include <opus/opus.h> #include <opus/opus.h>
#else #else
#include "opus.h" #include "opus.h"

2
OpusEncoder.cpp
View File

@ -9,7 +9,7 @@
#include <algorithm> #include <algorithm>
#include "logging.h" #include "logging.h"
#include "VoIPServerConfig.h" #include "VoIPServerConfig.h"
#ifdef HAVE_CONFIG_H #if defined HAVE_CONFIG_H || defined TGVOIP_USE_INSTALLED_OPUS
#include <opus/opus.h> #include <opus/opus.h>
#else #else
#include "opus.h" #include "opus.h"

11
libtgvoip.gyp
View File

@ -14,11 +14,9 @@
'variables': { 'variables': {
'tgvoip_src_loc': '.', 'tgvoip_src_loc': '.',
'special_build_target%': '', 'special_build_target%': '',
'linux_path_opus_include%': '<(DEPTH)/../../../Libraries/opus/include',
}, },
'include_dirs': [ 'include_dirs': [
'<(tgvoip_src_loc)/webrtc_dsp', '<(tgvoip_src_loc)/webrtc_dsp',
'<(linux_path_opus_include)',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
@ -817,6 +815,9 @@
[ [
'"<(OS)" == "win"', { '"<(OS)" == "win"', {
'msbuild_toolset': 'v142', 'msbuild_toolset': 'v142',
'include_dirs': [
'<(DEPTH)/../../../Libraries/opus/include',
],
'defines': [ 'defines': [
'NOMINMAX', 'NOMINMAX',
'_USING_V110_SDK71_', '_USING_V110_SDK71_',
@ -895,7 +896,11 @@
}, },
}, },
}, },
}, }, {
'defines': [
'TGVOIP_USE_INSTALLED_OPUS',
],
}
], ],
[ [
'"<(OS)" == "linux"', { '"<(OS)" == "linux"', {