From 95ce9fc00ff90465419331eee6e719b8b816a57c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 16 Dec 2018 17:10:01 +0300 Subject: [PATCH] wscript: explicitly set language when checking library --- engine/wscript | 2 +- wscript | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/engine/wscript b/engine/wscript index 73fc9c6a..fa1af247 100644 --- a/engine/wscript +++ b/engine/wscript @@ -18,7 +18,7 @@ def configure(conf): # check for dedicated server build if conf.options.DEDICATED: if(conf.env.DEST_OS == 'linux'): - conf.check( lib='rt' ) + conf.check_cc( lib='rt' ) conf.env.append_unique('DEFINES', 'SINGLE_BINARY') conf.env.append_unique('DEFINES', 'XASH_DEDICATED') else: diff --git a/wscript b/wscript index fb84702e..d5f39988 100644 --- a/wscript +++ b/wscript @@ -101,22 +101,22 @@ def configure(conf): conf.env.SINGLE_BINARY = conf.options.DEDICATED # We don't need game launcher on dedicated if conf.env.DEST_OS == 'linux': - conf.check( lib='dl' ) + conf.check_cc( lib='dl' ) if conf.env.DEST_OS != 'win32': - conf.check( lib='m' ) - conf.check( lib='pthread' ) + conf.check_cc( lib='m' ) + conf.check_cc( lib='pthread' ) else: # Common Win32 libraries # Don't check them more than once, to save time # Usually, they are always available # but we need them in uselib - conf.check( lib='user32' ) - conf.check( lib='shell32' ) - conf.check( lib='gdi32' ) - conf.check( lib='advapi32' ) - conf.check( lib='dbghelp' ) - conf.check( lib='psapi' ) + conf.check_cc( lib='user32' ) + conf.check_cc( lib='shell32' ) + conf.check_cc( lib='gdi32' ) + conf.check_cc( lib='advapi32' ) + conf.check_cc( lib='dbghelp' ) + conf.check_cc( lib='psapi' ) # indicate if we are packaging for Linux/BSD