YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-11 07:37:52 +00:00
Code Issues Projects Releases Wiki Activity

wscript: define CUSTOM_MODES and try to link with export that only exists when CUSTOM_MODES was defined in build-time

Browse Source
This commit is contained in:
Alibek Omarov 2022-08-31 19:48:42 +03:00
parent 3a8c58d192
commit 19c2061831
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/voice.c
View File

@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
*/ */
#include <opus.h> #define CUSTOM_MODES 1 // required to correctly link with Opus Custom
#include <opus_custom.h> #include <opus_custom.h>
#include "common.h" #include "common.h"
#include "client.h" #include "client.h"
@ -47,8 +47,8 @@ Voice_CodecInfo_f
*/ */
static void Voice_CodecInfo_f( void ) static void Voice_CodecInfo_f( void )
{ {
int encoderComplexity; int encoderComplexity = 0;
opus_int32 encoderBitrate; opus_int32 encoderBitrate = 0;
if( !voice.initialized ) if( !voice.initialized )
{ {

7
wscript
View File

@ -328,9 +328,14 @@ int main(int argc, char **argv) { strcasestr(argv[1], argv[2]); return 0; }'''
if not conf.options.BUILD_BUNDLED_DEPS: if not conf.options.BUILD_BUNDLED_DEPS:
# check if we can use system opus # check if we can use system opus
conf.define('CUSTOM_MODES', 1)
# try to link with export that only exists with CUSTOM_MODES defined
if conf.check_pkg('opus', 'opus', '''#include <opus_custom.h> if conf.check_pkg('opus', 'opus', '''#include <opus_custom.h>
int main(void){ return opus_custom_mode_create(44100, 1024, 0) != 0; }''', fatal = False): int main(void){ return !opus_custom_encoder_init(0, 0, 0); }''', fatal = False):
conf.env.HAVE_SYSTEM_OPUS = True conf.env.HAVE_SYSTEM_OPUS = True
else:
conf.undefine('CUSTOM_MODES')
conf.define('XASH_BUILD_COMMIT', conf.env.GIT_VERSION if conf.env.GIT_VERSION else 'notset') conf.define('XASH_BUILD_COMMIT', conf.env.GIT_VERSION if conf.env.GIT_VERSION else 'notset')
conf.define('XASH_LOW_MEMORY', conf.options.LOW_MEMORY) conf.define('XASH_LOW_MEMORY', conf.options.LOW_MEMORY)