diff --git a/engine/wscript b/engine/wscript
index ea024d98..d2b9bd4d 100644
--- a/engine/wscript
+++ b/engine/wscript
@@ -91,22 +91,18 @@ def build(bld):
 	includes = ['common', 'server', 'client', 'client/vgui', '.', '../public', '../common', '../pm_shared' ]
 
 	if bld.env.SINGLE_BINARY:
-		bld(
-			source   = source,
-			target   = 'xash',
-			features = 'c cprogram',
-			includes = includes,
-			use      = libs,
-			install_path = bld.env.BINDIR,
-			subsystem = bld.env.MSVC_SUBSYSTEM
-		)
+		install_path = bld.env.BINDIR
+		features = 'c cprogram'
 	else:
-		bld.shlib(
-			source   = source,
-			target   = 'xash',
-			features = 'c',
-			includes = includes,
-			use      = libs,
-			install_path = bld.env.LIBDIR,
-			subsystem = bld.env.MSVC_SUBSYSTEM
-		)
+		install_path = bld.env.LIBDIR
+		features = 'c cshlib'
+
+	bld(
+		source   = source,
+		target   = 'xash',
+		features = features,
+		includes = includes,
+		use      = libs,
+		install_path = install_path,
+		subsystem = bld.env.MSVC_SUBSYSTEM
+	)
diff --git a/wscript b/wscript
index 08f86e0a..a5a5618f 100644
--- a/wscript
+++ b/wscript
@@ -103,7 +103,6 @@ def configure(conf):
 		conf.options.NANOGL = True
 		conf.options.GLWES  = True
 		conf.options.GL     = False
-		conf.options.SINGLE_BINARY = True
 
 	# print(conf.options.ALLOW64)
 
@@ -201,6 +200,9 @@ def configure(conf):
 		if conf.env.SINGLE_BINARY and i.singlebin:
 			continue
 
+		if conf.env.DEST_OS2 == 'android' and i.singlebin:
+			continue
+
 		if conf.env.DEDICATED and i.dedicated:
 			continue
 
@@ -211,6 +213,9 @@ def build(bld):
 		if bld.env.SINGLE_BINARY and i.singlebin:
 			continue
 
+		if conf.env.DEST_OS2 == 'android' and i.singlebin:
+			continue
+
 		if bld.env.DEDICATED and i.dedicated:
 			continue