diff --git a/3rdparty/MultiEmulator b/3rdparty/MultiEmulator
index 7ab212ba..2f3c3a40 160000
--- a/3rdparty/MultiEmulator
+++ b/3rdparty/MultiEmulator
@@ -1 +1 @@
-Subproject commit 7ab212babb32d9216408af08c24fab59e6a57e19
+Subproject commit 2f3c3a40cd823d00d613d72596b1016306570f32
diff --git a/3rdparty/bzip2/wscript b/3rdparty/bzip2/wscript
index cb4973f0..a62a2c0f 100644
--- a/3rdparty/bzip2/wscript
+++ b/3rdparty/bzip2/wscript
@@ -14,6 +14,7 @@ def configure(conf):
 		conf.define('BZ_UNIX', 1)
 
 def build(bld):
+# doesn't work with CMake generator
 #	bld(
 #		features = 'subst',
 #		source = 'bzip2/bz_version.h.in',
@@ -27,7 +28,6 @@ def build(bld):
 		source = bz_sources,
 		target = 'bzip2',
 #		use = 'bz_version.h',
-		features = 'c',
 		includes = ['.', 'bzip2/'],
 		subsystem = bld.env.MSVC_SUBSYSTEM,
 		export_includes = ['bzip2/']
diff --git a/3rdparty/gl-wes-v2 b/3rdparty/gl-wes-v2
index 2d9b5afe..d4ed038d 160000
--- a/3rdparty/gl-wes-v2
+++ b/3rdparty/gl-wes-v2
@@ -1 +1 @@
-Subproject commit 2d9b5afe109ab9f1f7f39754a5ba550e8cffa80a
+Subproject commit d4ed038d13d4fd929a3f959b523cd1d9487aa94e
diff --git a/3rdparty/gl4es/wscript b/3rdparty/gl4es/wscript
index f23f8c3f..4558a65b 100644
--- a/3rdparty/gl4es/wscript
+++ b/3rdparty/gl4es/wscript
@@ -16,7 +16,6 @@ def build(bld):
 
 	bld.stlib(source   = gl4es_srcdir.ant_glob(['gl/*.c', 'gl/*/*.c', 'glx/hardext.c']),
 		target   = 'gl4es',
-		features = 'c',
 		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'],
 		cflags   = ['-w', '-fvisibility=hidden', '-std=gnu99'],
diff --git a/3rdparty/mainui b/3rdparty/mainui
index f1eccf95..abf5ad2c 160000
--- a/3rdparty/mainui
+++ b/3rdparty/mainui
@@ -1 +1 @@
-Subproject commit f1eccf951b019f13522c248d5a446d621174a156
+Subproject commit abf5ad2c34e0d04b29f5914701cb498aeac935ed
diff --git a/3rdparty/nanogl b/3rdparty/nanogl
index e75792de..6c0f341b 160000
--- a/3rdparty/nanogl
+++ b/3rdparty/nanogl
@@ -1 +1 @@
-Subproject commit e75792de037ee141f7d596b95cf17bef23b119e2
+Subproject commit 6c0f341b7b182af98a287d11261bf5bae7729009
diff --git a/3rdparty/vgui_support b/3rdparty/vgui_support
index 7276993f..e0ab9522 160000
--- a/3rdparty/vgui_support
+++ b/3rdparty/vgui_support
@@ -1 +1 @@
-Subproject commit 7276993f3f4103af3f19f8313ebb2f69416f7cac
+Subproject commit e0ab95229d118b946a82334ba9f9e34c703657ed
diff --git a/filesystem/wscript b/filesystem/wscript
index 294dceb8..73b832d7 100644
--- a/filesystem/wscript
+++ b/filesystem/wscript
@@ -25,7 +25,7 @@ def build(bld):
 		libs += [ 'public', 'ANDROID' ]
 
 	bld.shlib(target = 'filesystem_stdio',
-		features = 'cxx seq',
+		features = 'seq',
 		source = bld.path.ant_glob(['*.c', '*.cpp']),
 		use = libs,
 		install_path = bld.env.LIBDIR,
diff --git a/game_launch/wscript b/game_launch/wscript
index 05e980c2..939258ed 100644
--- a/game_launch/wscript
+++ b/game_launch/wscript
@@ -30,9 +30,8 @@ def build(bld):
 	if bld.env.DEST_OS == 'linux':
 		bld.env.LDFLAGS += ['-Wl,--no-as-needed', '-lm']
 
-	bld(source = source,
+	bld.program(source = source,
 		target   = 'xash3d', # hl.exe
-		features = 'c cxx cxxprogram',
 		use      = 'sdk_includes DL USER32 SHELL32 werror',
 		rpath    = bld.env.DEFAULT_RPATH,
 		install_path = bld.env.BINDIR,
diff --git a/public/wscript b/public/wscript
index d1597581..70ef340d 100644
--- a/public/wscript
+++ b/public/wscript
@@ -112,7 +112,6 @@ def build(bld):
 
 	bld.stlib(source   = bld.path.ant_glob('*.c'),
 		target   = 'public',
-		features = 'c',
 		use      = 'sdk_includes werror',
 		subsystem = bld.env.MSVC_SUBSYSTEM)
 
diff --git a/ref/gl/gl2_shim/wscript b/ref/gl/gl2_shim/wscript
index 6ce58332..a53aee64 100644
--- a/ref/gl/gl2_shim/wscript
+++ b/ref/gl/gl2_shim/wscript
@@ -18,7 +18,6 @@ def build(bld):
 	bld.stlib(
 		source    = source,
 		target    = 'gl2_shim',
-		features  = 'c',
 		includes  = includes,
 		use       = libs,
 		subsystem = bld.env.MSVC_SUBSYSTEM
diff --git a/ref/gl/vgl_shim/wscript b/ref/gl/vgl_shim/wscript
index 9456b7ba..3e2d7208 100644
--- a/ref/gl/vgl_shim/wscript
+++ b/ref/gl/vgl_shim/wscript
@@ -18,7 +18,6 @@ def build(bld):
 	bld.stlib(
 		source    = source,
 		target    = 'vgl_shim',
-		features  = 'c',
 		includes  = includes,
 		use       = libs,
 		subsystem = bld.env.MSVC_SUBSYSTEM
diff --git a/ref/gl/wscript b/ref/gl/wscript
index 94c741c7..825f4a56 100644
--- a/ref/gl/wscript
+++ b/ref/gl/wscript
@@ -76,7 +76,6 @@ def build(bld):
 
 		bld.shlib(source = source,
 			target = k,
-			features = 'c',
 			includes = includes,
 			use = libs + v['libs'],
 			defines = v['defines'],
diff --git a/ref/null/wscript b/ref/null/wscript
index 3a6ec152..06c1f1d0 100644
--- a/ref/null/wscript
+++ b/ref/null/wscript
@@ -12,7 +12,6 @@ def build(bld):
 	bld.shlib(
 		source   = 'r_context.c',
 		target   = 'ref_null',
-		features = 'c',
 		defines  = 'REF_DLL',
 		use      = 'engine_includes sdk_includes werror',
 		install_path = bld.env.LIBDIR,
diff --git a/ref/soft/wscript b/ref/soft/wscript
index 894ed88a..3f6ef8e7 100644
--- a/ref/soft/wscript
+++ b/ref/soft/wscript
@@ -34,7 +34,6 @@ def build(bld):
 
 	bld.shlib(source   = bld.path.ant_glob(['*.c']),
 		target   = 'ref_soft',
-		features = 'c',
 		includes = '.',
 		use      = libs,
 		install_path = bld.env.LIBDIR,
diff --git a/utils/mdldec/wscript b/utils/mdldec/wscript
index dc3e8676..790cc61a 100644
--- a/utils/mdldec/wscript
+++ b/utils/mdldec/wscript
@@ -16,9 +16,8 @@ def build(bld):
 	if bld.env.DISABLE_UTILS_MDLDEC:
 		return
 
-	bld(source   = bld.path.ant_glob('*.c'),
+	bld.program(source   = bld.path.ant_glob('*.c'),
 		target   = 'mdldec',
-		features = 'c cprogram',
 		includes = '.',
 		use      = 'engine_includes public M werror',
 		install_path = bld.env.BINDIR,
diff --git a/utils/run-fuzzer/wscript b/utils/run-fuzzer/wscript
index 3229c29b..124f528a 100644
--- a/utils/run-fuzzer/wscript
+++ b/utils/run-fuzzer/wscript
@@ -19,10 +19,9 @@ def add_runner_target(bld, lib, func):
 	source = bld.path.ant_glob('*.c')
 	includes = '.'
 
-	bld(
+	bld.program(
 		source   = source,
 		target   = 'run-fuzzer-' + func,
-		features = 'c cprogram',
 		includes = includes,
 		use      = 'DL werror',
 		defines  = ['FUNC="Fuzz_' + func + '"', 'LIB="' + lib + '"'],
diff --git a/utils/xar/wscript b/utils/xar/wscript
index e5378760..f1c7a1dc 100644
--- a/utils/xar/wscript
+++ b/utils/xar/wscript
@@ -9,9 +9,8 @@ def configure(conf):
 	pass
 
 def build(bld):
-	bld(source   = bld.path.ant_glob('*.c'),
+	bld.program(source   = bld.path.ant_glob('*.c'),
 		target   = 'xar',
-		features = 'c cprogram',
 		includes = '.',
 		use      = 'public filesystem_includes werror',
 		rpath = bld.env.DEFAULT_RPATH,