FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-25 19:30:08 +01:00
Code Issues 2 Projects Releases Wiki Activity

wscript: move werror flags into uselib

Browse Source
This commit is contained in:
Alibek Omarov 2024-01-30 15:04:57 +03:00
parent f67736180b
commit bfcaba54dc
12 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/wscript
View File

@ -125,7 +125,7 @@ def build(bld):
bld(name = 'engine_includes', export_includes = '. common common/imagelib', use = 'filesystem_includes') bld(name = 'engine_includes', export_includes = '. common common/imagelib', use = 'filesystem_includes')
is_cxx_link = False is_cxx_link = False
libs = [ 'engine_includes', 'public', 'dllemu' ] libs = [ 'engine_includes', 'public', 'dllemu', 'werror' ]
# basic build: dedicated only # basic build: dedicated only
source = bld.path.ant_glob([ source = bld.path.ant_glob([

2
filesystem/wscript
View File

@ -18,7 +18,7 @@ def configure(conf):
def build(bld): def build(bld):
bld(name = 'filesystem_includes', export_includes = '.') bld(name = 'filesystem_includes', export_includes = '.')
libs = [ 'filesystem_includes', 'sdk_includes' ] libs = [ 'filesystem_includes', 'sdk_includes', 'werror' ]
# on PSVita do not link any libraries that are already in the main executable, but add the includes target # on PSVita do not link any libraries that are already in the main executable, but add the includes target
if bld.env.DEST_OS != 'psvita': if bld.env.DEST_OS != 'psvita':

2
game_launch/wscript
View File

@ -33,7 +33,7 @@ def build(bld):
bld(source = source, bld(source = source,
target = 'xash3d', # hl.exe target = 'xash3d', # hl.exe
features = 'c cxx cxxprogram', features = 'c cxx cxxprogram',
use = 'sdk_includes DL USER32 SHELL32', use = 'sdk_includes DL USER32 SHELL32 werror',
rpath = bld.env.DEFAULT_RPATH, rpath = bld.env.DEFAULT_RPATH,
install_path = bld.env.BINDIR, install_path = bld.env.BINDIR,
subsystem = bld.env.MSVC_SUBSYSTEM subsystem = bld.env.MSVC_SUBSYSTEM

2
public/wscript
View File

@ -19,7 +19,7 @@ def build(bld):
bld.stlib(source = bld.path.ant_glob('*.c'), bld.stlib(source = bld.path.ant_glob('*.c'),
target = 'public', target = 'public',
features = 'c', features = 'c',
use = 'sdk_includes', use = 'sdk_includes werror',
subsystem = bld.env.MSVC_SUBSYSTEM) subsystem = bld.env.MSVC_SUBSYSTEM)
if bld.env.TESTS: if bld.env.TESTS:

2
ref/gl/gl2_shim/wscript
View File

@ -12,7 +12,7 @@ def configure(conf):
def build(bld): def build(bld):
source = bld.path.ant_glob( [ '*.c' ] ) source = bld.path.ant_glob( [ '*.c' ] )
includes = [ '.' ] includes = [ '.' ]
libs = [ 'engine_includes', 'sdk_includes' ] libs = [ 'engine_includes', 'sdk_includes', 'werror' ]
bld.env.LDFLAGS += ['-fPIC'] bld.env.LDFLAGS += ['-fPIC']
bld.env.CFLAGS += ['-fPIC'] bld.env.CFLAGS += ['-fPIC']
bld.stlib( bld.stlib(

2
ref/gl/vgl_shim/wscript
View File

@ -12,7 +12,7 @@ def configure(conf):
def build(bld): def build(bld):
source = bld.path.ant_glob( [ '*.c' ] ) source = bld.path.ant_glob( [ '*.c' ] )
includes = [ '.' ] includes = [ '.' ]
libs = [ 'engine_includes', 'sdk_includes' ] libs = [ 'engine_includes', 'sdk_includes', 'werror' ]
bld.env.LDFLAGS += ['-fPIC'] bld.env.LDFLAGS += ['-fPIC']
bld.env.CFLAGS += ['-fPIC'] bld.env.CFLAGS += ['-fPIC']
bld.stlib( bld.stlib(

2
ref/gl/wscript
View File

@ -32,7 +32,7 @@ def configure(conf):
conf.check_cc(lib='log') conf.check_cc(lib='log')
def build(bld): def build(bld):
libs = [ 'engine_includes' ] libs = [ 'engine_includes', 'werror' ]
# on PSVita do not link any libraries that are already in the main executable, but add the includes target # on PSVita do not link any libraries that are already in the main executable, but add the includes target
if bld.env.DEST_OS == 'psvita': if bld.env.DEST_OS == 'psvita':
libs += [ 'sdk_includes', 'vgl_shim' ] libs += [ 'sdk_includes', 'vgl_shim' ]

2
ref/soft/wscript
View File

@ -22,7 +22,7 @@ def configure(conf):
conf.env.append_unique('DEFINES', 'REF_DLL') conf.env.append_unique('DEFINES', 'REF_DLL')
def build(bld): def build(bld):
libs = [ 'engine_includes' ] libs = [ 'engine_includes', 'werror' ]
# on PSVita do not link any libraries that are already in the main executable, but add the includes target # on PSVita do not link any libraries that are already in the main executable, but add the includes target
if bld.env.DEST_OS == 'psvita': if bld.env.DEST_OS == 'psvita':
libs += [ 'sdk_includes' ] libs += [ 'sdk_includes' ]

2
utils/mdldec/wscript
View File

@ -20,7 +20,7 @@ def build(bld):
target = 'mdldec', target = 'mdldec',
features = 'c cprogram', features = 'c cprogram',
includes = '.', includes = '.',
use = 'engine_includes public M', use = 'engine_includes public M werror',
install_path = bld.env.BINDIR, install_path = bld.env.BINDIR,
subsystem = bld.env.CONSOLE_SUBSYSTEM subsystem = bld.env.CONSOLE_SUBSYSTEM
) )

3
utils/run-fuzzer/wscript
View File

@ -18,14 +18,13 @@ def configure(conf):
def add_runner_target(bld, lib, func): def add_runner_target(bld, lib, func):
source = bld.path.ant_glob('*.c') source = bld.path.ant_glob('*.c')
includes = '.' includes = '.'
libs = [ 'DL' ]
bld( bld(
source = source, source = source,
target = 'run-fuzzer-' + func, target = 'run-fuzzer-' + func,
features = 'c cprogram', features = 'c cprogram',
includes = includes, includes = includes,
use = libs, use = 'DL werror',
defines = ['FUNC="Fuzz_' + func + '"', 'LIB="' + lib + '"'], defines = ['FUNC="Fuzz_' + func + '"', 'LIB="' + lib + '"'],
install_path = bld.env.BINDIR, install_path = bld.env.BINDIR,
subsystem = bld.env.CONSOLE_SUBSYSTEM subsystem = bld.env.CONSOLE_SUBSYSTEM

2
utils/xar/wscript
View File

@ -13,7 +13,7 @@ def build(bld):
target = 'xar', target = 'xar',
features = 'c cprogram', features = 'c cprogram',
includes = '.', includes = '.',
use = 'public filesystem_includes', use = 'public filesystem_includes werror',
rpath = bld.env.DEFAULT_RPATH, rpath = bld.env.DEFAULT_RPATH,
install_path = bld.env.BINDIR, install_path = bld.env.BINDIR,
subsystem = bld.env.CONSOLE_SUBSYSTEM subsystem = bld.env.CONSOLE_SUBSYSTEM

17
wscript
View File

@ -340,11 +340,8 @@ def configure(conf):
opt_cxxflags = [] # TODO: opt_cxxflags = [] # TODO:
cflags = conf.filter_cflags(opt_flags + opt_cflags, cflags) conf.env.CFLAGS_werror = conf.filter_cflags(opt_flags + opt_cflags, cflags)
cxxflags = conf.filter_cxxflags(opt_flags + opt_cxxflags, cxxflags) conf.env.CXXFLAGS_werror = conf.filter_cxxflags(opt_flags + opt_cxxflags, cxxflags)
conf.env.append_unique('CFLAGS', cflags)
conf.env.append_unique('CXXFLAGS', cxxflags)
conf.env.TESTS = conf.options.TESTS conf.env.TESTS = conf.options.TESTS
conf.env.ENABLE_UTILS = conf.options.ENABLE_UTILS conf.env.ENABLE_UTILS = conf.options.ENABLE_UTILS
@ -425,7 +422,7 @@ def configure(conf):
tgmath_usable = conf.check_cc(fragment='''#include<tgmath.h> tgmath_usable = conf.check_cc(fragment='''#include<tgmath.h>
const float val = 2, val2 = 3; const float val = 2, val2 = 3;
int main(void){ return (int)(-asin(val) + cos(val2)); }''', int main(void){ return (int)(-asin(val) + cos(val2)); }''',
msg='Checking if tgmath.h is usable', mandatory=False, use='M') msg='Checking if tgmath.h is usable', mandatory=False, use='M werror')
conf.define_cond('HAVE_TGMATH_H', tgmath_usable) conf.define_cond('HAVE_TGMATH_H', tgmath_usable)
else: else:
conf.undefine('HAVE_TGMATH_H') conf.undefine('HAVE_TGMATH_H')
@ -443,7 +440,7 @@ def configure(conf):
int t2[(((64 * GB -1) % 671088649) == 268434537) int t2[(((64 * GB -1) % 671088649) == 268434537)
&& (((TB - (64 * GB -1) + 255) % 1792151290) == 305159546)? 1: -1]; && (((TB - (64 * GB -1) + 255) % 1792151290) == 305159546)? 1: -1];
int main(void) { return 0; }''', int main(void) { return 0; }''',
msg='Checking if _FILE_OFFSET_BITS can be defined to 64', mandatory=False) msg='Checking if _FILE_OFFSET_BITS can be defined to 64', mandatory=False, use='werror')
if file_offset_bits_usable: if file_offset_bits_usable:
conf.define('_FILE_OFFSET_BITS', 64) conf.define('_FILE_OFFSET_BITS', 64)
else: conf.undefine('_FILE_OFFSET_BITS') else: conf.undefine('_FILE_OFFSET_BITS')
@ -455,9 +452,9 @@ int main(int argc, char **argv) { strcasestr(argv[1], argv[2]); return 0; }'''
int main(int argc, char **argv) { strchrnul(argv[1], 'x'); return 0; }''' int main(int argc, char **argv) { strchrnul(argv[1], 'x'); return 0; }'''
def check_gnu_function(frag, msg, define): def check_gnu_function(frag, msg, define):
if conf.check_cc(msg=msg, mandatory=False, fragment=frag): if conf.check_cc(msg=msg, mandatory=False, fragment=frag, use='werror'):
conf.define(define, 1) conf.define(define, 1)
elif conf.check_cc(msg='... with _GNU_SOURCE?', mandatory=False, fragment=frag, defines='_GNU_SOURCE=1'): elif conf.check_cc(msg='... with _GNU_SOURCE?', mandatory=False, fragment=frag, defines='_GNU_SOURCE=1', use='werror'):
conf.define(define, 1) conf.define(define, 1)
conf.define('_GNU_SOURCE', 1) conf.define('_GNU_SOURCE', 1)
check_gnu_function(strcasestr_frag, 'Checking for strcasestr', 'HAVE_STRCASESTR') check_gnu_function(strcasestr_frag, 'Checking for strcasestr', 'HAVE_STRCASESTR')
@ -484,7 +481,7 @@ int main(int argc, char **argv) { strchrnul(argv[1], 'x'); return 0; }'''
frag='''#include <opus_custom.h> frag='''#include <opus_custom.h>
int main(void) { return !opus_custom_encoder_init((OpusCustomEncoder *)1, (const OpusCustomMode *)1, 1); }''' int main(void) { return !opus_custom_encoder_init((OpusCustomEncoder *)1, (const OpusCustomMode *)1, 1); }'''
if conf.check_cc(msg='Checking if opus supports custom modes', defines='CUSTOM_MODES=1', use='opus', fragment=frag, mandatory=False): if conf.check_cc(msg='Checking if opus supports custom modes', defines='CUSTOM_MODES=1', use='opus werror', fragment=frag, mandatory=False):
conf.env.HAVE_SYSTEM_OPUS = True conf.env.HAVE_SYSTEM_OPUS = True
conf.define('XASH_LOW_MEMORY', conf.options.LOW_MEMORY) conf.define('XASH_LOW_MEMORY', conf.options.LOW_MEMORY)