mirror of
https://github.com/YGGverse/xash3d-fwgs.git
synced 2025-08-26 05:41:53 +00:00
wscript: cleanup defaults, now that we don't need to specify most options from here
This commit is contained in:
parent
216e680965
commit
026435865a
2
3rdparty/mainui
vendored
2
3rdparty/mainui
vendored
@ -1 +1 @@
|
||||
Subproject commit a1b22896615ae999607e83b91e754b935ae59e60
|
||||
Subproject commit b1d006e521a4cfca8e576115a43a7cb8a3dbf79b
|
2
3rdparty/vgui_support
vendored
2
3rdparty/vgui_support
vendored
@ -1 +1 @@
|
||||
Subproject commit d585ab86da48c3bce10d9111c87fb9f4c2bbcc67
|
||||
Subproject commit 9f2b9512cd73effd1f103c8811f7f5adf5af5410
|
32
wscript
32
wscript
@ -227,18 +227,16 @@ def configure(conf):
|
||||
|
||||
conf.load('msvs subproject clang_compilation_database strip_on_install waf_unit_test enforce_pic force_32bit')
|
||||
|
||||
conf.env.MSVC_SUBSYSTEM = 'WINDOWS'
|
||||
conf.env.CONSOLE_SUBSYSTEM = 'CONSOLE'
|
||||
|
||||
# Windows XP compatibility
|
||||
if conf.env.MSVC_TARGETS[0] == 'amd64_x86' or 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'
|
||||
conf.env.MSVC_SUBSYSTEM += ',5.01'
|
||||
conf.env.CONSOLE_SUBSYSTEM += ',5.01'
|
||||
|
||||
enforce_pic = True # modern defaults
|
||||
|
||||
# modify options dictionary early
|
||||
# Set default options for some platforms
|
||||
if conf.env.DEST_OS == 'android':
|
||||
conf.options.NO_VGUI = True # skip vgui
|
||||
conf.options.NANOGL = True
|
||||
conf.options.GLWES = False # deprecated
|
||||
conf.options.GL4ES = True
|
||||
@ -246,24 +244,12 @@ def configure(conf):
|
||||
conf.options.GL = False
|
||||
elif conf.env.MAGX:
|
||||
conf.options.SDL12 = True
|
||||
conf.options.NO_VGUI = True
|
||||
conf.options.GL = False
|
||||
conf.options.LOW_MEMORY = 1
|
||||
enforce_pic = False
|
||||
elif conf.env.DEST_OS == 'nswitch':
|
||||
conf.options.NO_VGUI = True
|
||||
conf.options.GL = True
|
||||
conf.options.USE_STBTT = True
|
||||
elif conf.env.DEST_OS == 'psvita':
|
||||
conf.options.NO_VGUI = True
|
||||
conf.options.GL = True
|
||||
conf.options.USE_STBTT = True
|
||||
# we'll specify -fPIC by hand for shared libraries only
|
||||
enforce_pic = False
|
||||
|
||||
if conf.env.STATIC_LINKING:
|
||||
enforce_pic = False # PIC may break full static builds
|
||||
|
||||
# psvita needs -fPIC set manually and static builds are incompatible with -fPIC
|
||||
enforce_pic = conf.env.DEST_OS != 'psvita' and not conf.env.STATIC_LINKING
|
||||
conf.check_pic(enforce_pic)
|
||||
|
||||
# NOTE: We restrict 64-bit builds ONLY for Win/Linux running on Intel architecture
|
||||
|
Loading…
x
Reference in New Issue
Block a user