2
0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-21 17:37:32 +01:00

wscript: remove useless features

This commit is contained in:
Alibek Omarov 2024-10-23 23:20:47 +03:00
parent ba2191172d
commit a15c1f99b2
18 changed files with 11 additions and 22 deletions

@ -1 +1 @@
Subproject commit 7ab212babb32d9216408af08c24fab59e6a57e19 Subproject commit 2f3c3a40cd823d00d613d72596b1016306570f32

View File

@ -14,6 +14,7 @@ def configure(conf):
conf.define('BZ_UNIX', 1) conf.define('BZ_UNIX', 1)
def build(bld): def build(bld):
# doesn't work with CMake generator
# bld( # bld(
# features = 'subst', # features = 'subst',
# source = 'bzip2/bz_version.h.in', # source = 'bzip2/bz_version.h.in',
@ -27,7 +28,6 @@ def build(bld):
source = bz_sources, source = bz_sources,
target = 'bzip2', target = 'bzip2',
# use = 'bz_version.h', # use = 'bz_version.h',
features = 'c',
includes = ['.', 'bzip2/'], includes = ['.', 'bzip2/'],
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
export_includes = ['bzip2/'] export_includes = ['bzip2/']

2
3rdparty/gl-wes-v2 vendored

@ -1 +1 @@
Subproject commit 2d9b5afe109ab9f1f7f39754a5ba550e8cffa80a Subproject commit d4ed038d13d4fd929a3f959b523cd1d9487aa94e

View File

@ -16,7 +16,6 @@ def build(bld):
bld.stlib(source = gl4es_srcdir.ant_glob(['gl/*.c', 'gl/*/*.c', 'glx/hardext.c']), bld.stlib(source = gl4es_srcdir.ant_glob(['gl/*.c', 'gl/*/*.c', 'glx/hardext.c']),
target = 'gl4es', target = 'gl4es',
features = 'c',
includes = ['gl4es/src', 'gl4es/src/gl', 'gl4es/src/glx', 'gl4es/include'], includes = ['gl4es/src', 'gl4es/src/gl', 'gl4es/src/glx', 'gl4es/include'],
defines = ['NOX11', 'NO_GBM', 'NO_INIT_CONSTRUCTOR', 'DEFAULT_ES=2', 'NOEGL', 'NO_LOADER', 'STATICLIB'], defines = ['NOX11', 'NO_GBM', 'NO_INIT_CONSTRUCTOR', 'DEFAULT_ES=2', 'NOEGL', 'NO_LOADER', 'STATICLIB'],
cflags = ['-w', '-fvisibility=hidden', '-std=gnu99'], cflags = ['-w', '-fvisibility=hidden', '-std=gnu99'],

2
3rdparty/mainui vendored

@ -1 +1 @@
Subproject commit f1eccf951b019f13522c248d5a446d621174a156 Subproject commit abf5ad2c34e0d04b29f5914701cb498aeac935ed

2
3rdparty/nanogl vendored

@ -1 +1 @@
Subproject commit e75792de037ee141f7d596b95cf17bef23b119e2 Subproject commit 6c0f341b7b182af98a287d11261bf5bae7729009

@ -1 +1 @@
Subproject commit 7276993f3f4103af3f19f8313ebb2f69416f7cac Subproject commit e0ab95229d118b946a82334ba9f9e34c703657ed

View File

@ -25,7 +25,7 @@ def build(bld):
libs += [ 'public', 'ANDROID' ] libs += [ 'public', 'ANDROID' ]
bld.shlib(target = 'filesystem_stdio', bld.shlib(target = 'filesystem_stdio',
features = 'cxx seq', features = 'seq',
source = bld.path.ant_glob(['*.c', '*.cpp']), source = bld.path.ant_glob(['*.c', '*.cpp']),
use = libs, use = libs,
install_path = bld.env.LIBDIR, install_path = bld.env.LIBDIR,

View File

@ -30,9 +30,8 @@ def build(bld):
if bld.env.DEST_OS == 'linux': if bld.env.DEST_OS == 'linux':
bld.env.LDFLAGS += ['-Wl,--no-as-needed', '-lm'] bld.env.LDFLAGS += ['-Wl,--no-as-needed', '-lm']
bld(source = source, bld.program(source = source,
target = 'xash3d', # hl.exe target = 'xash3d', # hl.exe
features = 'c cxx cxxprogram',
use = 'sdk_includes DL USER32 SHELL32 werror', 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,

View File

@ -112,7 +112,6 @@ 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',
use = 'sdk_includes werror', use = 'sdk_includes werror',
subsystem = bld.env.MSVC_SUBSYSTEM) subsystem = bld.env.MSVC_SUBSYSTEM)

View File

@ -18,7 +18,6 @@ def build(bld):
bld.stlib( bld.stlib(
source = source, source = source,
target = 'gl2_shim', target = 'gl2_shim',
features = 'c',
includes = includes, includes = includes,
use = libs, use = libs,
subsystem = bld.env.MSVC_SUBSYSTEM subsystem = bld.env.MSVC_SUBSYSTEM

View File

@ -18,7 +18,6 @@ def build(bld):
bld.stlib( bld.stlib(
source = source, source = source,
target = 'vgl_shim', target = 'vgl_shim',
features = 'c',
includes = includes, includes = includes,
use = libs, use = libs,
subsystem = bld.env.MSVC_SUBSYSTEM subsystem = bld.env.MSVC_SUBSYSTEM

View File

@ -76,7 +76,6 @@ def build(bld):
bld.shlib(source = source, bld.shlib(source = source,
target = k, target = k,
features = 'c',
includes = includes, includes = includes,
use = libs + v['libs'], use = libs + v['libs'],
defines = v['defines'], defines = v['defines'],

View File

@ -12,7 +12,6 @@ def build(bld):
bld.shlib( bld.shlib(
source = 'r_context.c', source = 'r_context.c',
target = 'ref_null', target = 'ref_null',
features = 'c',
defines = 'REF_DLL', defines = 'REF_DLL',
use = 'engine_includes sdk_includes werror', use = 'engine_includes sdk_includes werror',
install_path = bld.env.LIBDIR, install_path = bld.env.LIBDIR,

View File

@ -34,7 +34,6 @@ def build(bld):
bld.shlib(source = bld.path.ant_glob(['*.c']), bld.shlib(source = bld.path.ant_glob(['*.c']),
target = 'ref_soft', target = 'ref_soft',
features = 'c',
includes = '.', includes = '.',
use = libs, use = libs,
install_path = bld.env.LIBDIR, install_path = bld.env.LIBDIR,

View File

@ -16,9 +16,8 @@ def build(bld):
if bld.env.DISABLE_UTILS_MDLDEC: if bld.env.DISABLE_UTILS_MDLDEC:
return return
bld(source = bld.path.ant_glob('*.c'), bld.program(source = bld.path.ant_glob('*.c'),
target = 'mdldec', target = 'mdldec',
features = 'c cprogram',
includes = '.', includes = '.',
use = 'engine_includes public M werror', use = 'engine_includes public M werror',
install_path = bld.env.BINDIR, install_path = bld.env.BINDIR,

View File

@ -19,10 +19,9 @@ def add_runner_target(bld, lib, func):
source = bld.path.ant_glob('*.c') source = bld.path.ant_glob('*.c')
includes = '.' includes = '.'
bld( bld.program(
source = source, source = source,
target = 'run-fuzzer-' + func, target = 'run-fuzzer-' + func,
features = 'c cprogram',
includes = includes, includes = includes,
use = 'DL werror', use = 'DL werror',
defines = ['FUNC="Fuzz_' + func + '"', 'LIB="' + lib + '"'], defines = ['FUNC="Fuzz_' + func + '"', 'LIB="' + lib + '"'],

View File

@ -9,9 +9,8 @@ def configure(conf):
pass pass
def build(bld): def build(bld):
bld(source = bld.path.ant_glob('*.c'), bld.program(source = bld.path.ant_glob('*.c'),
target = 'xar', target = 'xar',
features = 'c cprogram',
includes = '.', includes = '.',
use = 'public filesystem_includes werror', use = 'public filesystem_includes werror',
rpath = bld.env.DEFAULT_RPATH, rpath = bld.env.DEFAULT_RPATH,