diff --git a/scripts/waflib/sdl2.py b/scripts/waflib/sdl2.py index 30d46b53..d3679726 100644 --- a/scripts/waflib/sdl2.py +++ b/scripts/waflib/sdl2.py @@ -15,12 +15,10 @@ import os def options(opt): grp = opt.add_option_group('SDL2 options') - grp.add_option( - '--sdl2', action='store', type='string', dest = 'SDL2_PATH', default = None, + grp.add_option('--sdl2', action='store', dest = 'SDL2_PATH', default = None, help = 'path to precompiled SDL2 library(required for Windows)') - grp.add_option( - '--skip-sdl2-sanity-check', action='store_false', default = True, dest='SDL2_SANITY_CHECK', + grp.add_option('--skip-sdl2-sanity-check', action='store_false', default = True, dest='SDL2_SANITY_CHECK', help = 'skip checking SDL2 sanity') def my_dirname(path): diff --git a/scripts/waflib/xcompile.py b/scripts/waflib/xcompile.py index 4a2ec5cb..b83cc314 100644 --- a/scripts/waflib/xcompile.py +++ b/scripts/waflib/xcompile.py @@ -111,7 +111,7 @@ class Android: def options(opt): android = opt.add_option_group('Android options') - android.add_option('--android', action='store', type='string', dest='ANDROID_OPTS', default=None, + android.add_option('--android', action='store', dest='ANDROID_OPTS', default=None, help='enable building for android, format: --android=,,, example: --android=arm,4.9,26') def configure(conf): diff --git a/vgui_support/wscript b/vgui_support/wscript index 0cdc0b18..20aa25a8 100644 --- a/vgui_support/wscript +++ b/vgui_support/wscript @@ -10,16 +10,13 @@ top = '.' def options(opt): grp = opt.add_option_group('VGUI options') - grp.add_option( - '--vgui', action = 'store', type='string', dest = 'VGUI_DEV', + grp.add_option('--vgui', action = 'store', dest = 'VGUI_DEV', help = 'path to vgui-dev repo', default='' ) - grp.add_option( - '--disable-vgui', action = 'store_true', dest = 'NO_VGUI', + grp.add_option('--disable-vgui', action = 'store_true', dest = 'NO_VGUI', help = 'disable vgui_support', default=False ) - grp.add_option( - '--skip-vgui-sanity-check', action = 'store_false', dest = 'VGUI_SANITY_CHECK', + grp.add_option('--skip-vgui-sanity-check', action = 'store_false', dest = 'VGUI_SANITY_CHECK', help = 'skip checking VGUI sanity', default=True ) return diff --git a/wscript b/wscript index acf7642b..da503401 100644 --- a/wscript +++ b/wscript @@ -39,28 +39,22 @@ def subdirs(): def options(opt): grp = opt.add_option_group('Common options') - grp.add_option( - '--build-type', action='store', type='string', dest='BUILD_TYPE', default = None, + grp.add_option('--build-type', action='store', dest='BUILD_TYPE', default = None, help = 'build type: debug, release or none(custom flags)') - grp.add_option( - '--dedicated', action = 'store_true', dest = 'DEDICATED', default = False, + grp.add_option('--dedicated', action = 'store_true', dest = 'DEDICATED', default = False, help = 'build Xash Dedicated Server(XashDS)') - grp.add_option( - '--single-binary', action = 'store_true', dest = 'SINGLE_BINARY', default = False, + grp.add_option( '--single-binary', action = 'store_true', dest = 'SINGLE_BINARY', default = False, help = 'build single "xash" binary instead of xash.dll/libxash.so (forced for dedicated)') - grp.add_option( - '--64bits', action = 'store_true', dest = 'ALLOW64', default = False, + grp.add_option('--64bits', action = 'store_true', dest = 'ALLOW64', default = False, help = 'allow targetting 64-bit engine') - grp.add_option( - '--win-style-install', action = 'store_true', dest = 'WIN_INSTALL', default = False, + grp.add_option('--win-style-install', action = 'store_true', dest = 'WIN_INSTALL', default = False, help = 'install like Windows build, ignore prefix, useful for development') - grp.add_option( - '--skip-subprojects', action='store', type = 'string', dest = 'SKIP_SUBDIRS', default=None, + grp.add_option('--skip-subprojects', action='store', dest = 'SKIP_SUBDIRS', default=None, help = 'don\'t recurse into specified subprojects. Current subdirs: ' + str(subdirs())) for i in SUBDIRS: