Browse Source

engine: wscript: don't build external launcher for Android and disable main()

pull/2/head
Alibek Omarov 6 years ago
parent
commit
e06b7412ac
  1. 32
      engine/wscript
  2. 7
      wscript

32
engine/wscript

@ -91,22 +91,18 @@ def build(bld):
includes = ['common', 'server', 'client', 'client/vgui', '.', '../public', '../common', '../pm_shared' ] includes = ['common', 'server', 'client', 'client/vgui', '.', '../public', '../common', '../pm_shared' ]
if bld.env.SINGLE_BINARY: if bld.env.SINGLE_BINARY:
bld( install_path = bld.env.BINDIR
source = source, features = 'c cprogram'
target = 'xash',
features = 'c cprogram',
includes = includes,
use = libs,
install_path = bld.env.BINDIR,
subsystem = bld.env.MSVC_SUBSYSTEM
)
else: else:
bld.shlib( install_path = bld.env.LIBDIR
source = source, features = 'c cshlib'
target = 'xash',
features = 'c', bld(
includes = includes, source = source,
use = libs, target = 'xash',
install_path = bld.env.LIBDIR, features = features,
subsystem = bld.env.MSVC_SUBSYSTEM includes = includes,
) use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM
)

7
wscript

@ -103,7 +103,6 @@ def configure(conf):
conf.options.NANOGL = True conf.options.NANOGL = True
conf.options.GLWES = True conf.options.GLWES = True
conf.options.GL = False conf.options.GL = False
conf.options.SINGLE_BINARY = True
# print(conf.options.ALLOW64) # print(conf.options.ALLOW64)
@ -201,6 +200,9 @@ def configure(conf):
if conf.env.SINGLE_BINARY and i.singlebin: if conf.env.SINGLE_BINARY and i.singlebin:
continue continue
if conf.env.DEST_OS2 == 'android' and i.singlebin:
continue
if conf.env.DEDICATED and i.dedicated: if conf.env.DEDICATED and i.dedicated:
continue continue
@ -211,6 +213,9 @@ def build(bld):
if bld.env.SINGLE_BINARY and i.singlebin: if bld.env.SINGLE_BINARY and i.singlebin:
continue continue
if conf.env.DEST_OS2 == 'android' and i.singlebin:
continue
if bld.env.DEDICATED and i.dedicated: if bld.env.DEDICATED and i.dedicated:
continue continue

Loading…
Cancel
Save