FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

wscript: move C only flags from common flags, correct multicheck again

This commit is contained in:
Alibek Omarov 2019-10-18 06:20:27 +03:00
parent 32897450fc
commit bc56ce754b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mainui

@ -1 +1 @@
Subproject commit 26fc03f7a8dc09d446773a7d8224da18089628cd Subproject commit 6010d18cd0d3974ced906db5a8268ed646e77a24

11
wscript
View File

@ -170,8 +170,6 @@ def configure(conf):
compiler_optional_flags = [ compiler_optional_flags = [
'-fdiagnostics-color=always', '-fdiagnostics-color=always',
'-Werror=implicit-function-declaration',
'-Werror=int-conversion',
'-Werror=return-type', '-Werror=return-type',
'-Werror=parentheses', '-Werror=parentheses',
'-Werror=vla', '-Werror=vla',
@ -184,6 +182,8 @@ def configure(conf):
] ]
c_compiler_optional_flags = [ c_compiler_optional_flags = [
'-Werror=implicit-function-declaration',
'-Werror=int-conversion',
'-Werror=implicit-int', '-Werror=implicit-int',
'-Werror=strict-prototypes', '-Werror=strict-prototypes',
'-Werror=old-style-declaration', '-Werror=old-style-declaration',
@ -225,8 +225,8 @@ def configure(conf):
conf.check_cc(cflags=cflags, msg= 'Checking for required C flags') conf.check_cc(cflags=cflags, msg= 'Checking for required C flags')
conf.check_cxx(cxxflags=cflags, msg= 'Checking for required C++ flags') conf.check_cxx(cxxflags=cflags, msg= 'Checking for required C++ flags')
cflags += conf.filter_cflags(compiler_optional_flags + c_compiler_optional_flags, cflags)
cxxflags += conf.filter_cxxflags(compiler_optional_flags, cflags) cxxflags += conf.filter_cxxflags(compiler_optional_flags, cflags)
cflags += conf.filter_cflags(compiler_optional_flags + c_compiler_optional_flags, cflags)
conf.env.append_unique('CFLAGS', cflags) conf.env.append_unique('CFLAGS', cflags)
conf.env.append_unique('CXXFLAGS', cxxflags) conf.env.append_unique('CXXFLAGS', cxxflags)
@ -253,7 +253,8 @@ def configure(conf):
'features': 'c', 'features': 'c',
'message': '...' + x, 'message': '...' + x,
'lib': x, 'lib': x,
'uselib_store': x.upper() 'uselib_store': x.upper(),
'global_define': False,
}, [ }, [
'user32', 'user32',
'shell32', 'shell32',
@ -264,7 +265,7 @@ def configure(conf):
'ws2_32' 'ws2_32'
]) ])
conf.multicheck(*a) conf.multicheck(*a, run_all_tests = True, mandatory = True)
# indicate if we are packaging for Linux/BSD # indicate if we are packaging for Linux/BSD
if(not conf.options.WIN_INSTALL and if(not conf.options.WIN_INSTALL and