YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-30 16:54:29 +00:00
Code Issues Projects Releases Wiki Activity

mdldec: build with CONSOLE subsystem on Win32

Browse Source
This commit is contained in:
Alibek Omarov 2021-03-05 17:59:54 +03:00
parent 385cc3f497
commit 9b6f26c191
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/mdldec/wscript
View File

@ -27,7 +27,7 @@ def build(bld):
includes = includes, includes = includes,
use = libs, use = libs,
install_path = bld.env.BINDIR, install_path = bld.env.BINDIR,
subsystem = bld.env.MSVC_SUBSYSTEM subsystem = bld.env.CONSOLE_SUBSYSTEM
) )
bld.install_files(bld.env.SHAREDIR, 'res/activities.txt') bld.install_files(bld.env.SHAREDIR, 'res/activities.txt')

12
wscript
View File

@ -114,10 +114,6 @@ def configure(conf):
if conf.options.IGNORE_PROJECTS: if conf.options.IGNORE_PROJECTS:
conf.env.IGNORE_PROJECTS = conf.options.IGNORE_PROJECTS.split(',') conf.env.IGNORE_PROJECTS = conf.options.IGNORE_PROJECTS.split(',')
# Force XP compability, all build targets should add
# subsystem=bld.env.MSVC_SUBSYSTEM
# TODO: wrapper around bld.stlib, bld.shlib and so on?
conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01'
conf.env.MSVC_TARGETS = ['x86' if not conf.options.ALLOW64 else 'x64'] conf.env.MSVC_TARGETS = ['x86' if not conf.options.ALLOW64 else 'x64']
# Load compilers early # Load compilers early
@ -132,6 +128,14 @@ def configure(conf):
conf.load('msvs msdev subproject gitversion clang_compilation_database strip_on_install waf_unit_test enforce_pic') conf.load('msvs msdev subproject gitversion clang_compilation_database strip_on_install waf_unit_test enforce_pic')
# Force XP compatibility, all build targets should add subsystem=bld.env.MSVC_SUBSYSTEM
if conf.env.MSVC_TARGETS[0] == 'x86':
conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01'
conf.env.CONSOLE_SUBSYSTEM = 'CONSOLE,5.01'
else:
conf.env.MSVC_SUBSYSTEM = 'WINDOWS'
conf.env.CONSOLE_SUBSYSTEM = 'CONSOLE'
enforce_pic = True # modern defaults enforce_pic = True # modern defaults
# modify options dictionary early # modify options dictionary early