mirror of
https://github.com/w23/xash3d-fwgs
synced 2025-01-18 23:00:01 +01:00
wscript: add possibility to select windows subsystem during link, add define to use WinXP SDK. This commit forces WinXP compability on latest Visual Studio
This commit is contained in:
parent
e9e364f054
commit
ca501c0378
@ -94,7 +94,8 @@ def build(bld):
|
|||||||
features = 'c cprogram',
|
features = 'c cprogram',
|
||||||
includes = includes,
|
includes = includes,
|
||||||
use = libs,
|
use = libs,
|
||||||
install_path = bld.env.BINDIR
|
install_path = bld.env.BINDIR,
|
||||||
|
subsystem = bld.env.MSVC_SUBSYSTEM
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
bld.shlib(
|
bld.shlib(
|
||||||
@ -103,5 +104,6 @@ def build(bld):
|
|||||||
features = 'c',
|
features = 'c',
|
||||||
includes = includes,
|
includes = includes,
|
||||||
use = libs,
|
use = libs,
|
||||||
install_path = bld.env.LIBDIR
|
install_path = bld.env.LIBDIR,
|
||||||
|
subsystem = bld.env.MSVC_SUBSYSTEM
|
||||||
)
|
)
|
||||||
|
@ -63,5 +63,6 @@ def build(bld):
|
|||||||
features = 'c cprogram',
|
features = 'c cprogram',
|
||||||
includes = includes,
|
includes = includes,
|
||||||
use = libs,
|
use = libs,
|
||||||
install_path = bld.env.BINDIR
|
install_path = bld.env.BINDIR,
|
||||||
|
subsystem = bld.env.MSVC_SUBSYSTEM
|
||||||
)
|
)
|
||||||
|
2
mainui
2
mainui
@ -1 +1 @@
|
|||||||
Subproject commit dac66977620487260c7351c2a2c845f081a5dc71
|
Subproject commit 72233d02c1a0912e8667fab1ce4561b470ce4293
|
12
wscript
12
wscript
@ -71,13 +71,11 @@ def configure(conf):
|
|||||||
conf.env.DEST_64BIT = False # predict state
|
conf.env.DEST_64BIT = False # predict state
|
||||||
try:
|
try:
|
||||||
conf.check_cc(
|
conf.check_cc(
|
||||||
fragment='''
|
fragment='''int main( void )
|
||||||
int main( void )
|
|
||||||
{
|
{
|
||||||
int check[sizeof(void*) == 4 ? 1: -1];
|
int check[sizeof(void*) == 4 ? 1: -1];
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}''',
|
||||||
''',
|
|
||||||
msg = 'Checking if compiler create 32 bit code')
|
msg = 'Checking if compiler create 32 bit code')
|
||||||
except conf.errors.ConfigurationError:
|
except conf.errors.ConfigurationError:
|
||||||
# Program not compiled, we have 64 bit
|
# Program not compiled, we have 64 bit
|
||||||
@ -112,6 +110,12 @@ def configure(conf):
|
|||||||
conf.env.append_unique('CFLAGS', ['/Z7'])
|
conf.env.append_unique('CFLAGS', ['/Z7'])
|
||||||
conf.env.append_unique('CXXFLAGS', ['/Z7'])
|
conf.env.append_unique('CXXFLAGS', ['/Z7'])
|
||||||
conf.env.append_unique('LINKFLAGS', ['/DEBUG'])
|
conf.env.append_unique('LINKFLAGS', ['/DEBUG'])
|
||||||
|
conf.env.append_unique('DEFINES', '_USING_V110_SDK71_') # Force XP compability
|
||||||
|
|
||||||
|
# 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'
|
||||||
|
|
||||||
if(conf.env.DEST_OS != 'win32'):
|
if(conf.env.DEST_OS != 'win32'):
|
||||||
conf.check( lib='dl' )
|
conf.check( lib='dl' )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user