d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-01-13 00:28:18 +00:00
Code Issues Projects Releases Wiki Activity

force32_bit should be loaded before check_pkg calls

Browse Source
This commit is contained in:
nillerusr 2021-05-23 18:18:18 +03:00
parent d349b1769a
commit 8d6eeb47bf
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wscript
View File

@ -216,6 +216,7 @@ def configure(conf):
conf.load('subproject xcompile compiler_c compiler_cxx gitversion clang_compilation_database strip_on_install waf_unit_test enforce_pic') conf.load('subproject xcompile compiler_c compiler_cxx gitversion clang_compilation_database strip_on_install waf_unit_test enforce_pic')
define_platform(conf) define_platform(conf)
conf.load('force_32bit')
if conf.options.SDL: if conf.options.SDL:
conf.check_cfg(package='sdl2', uselib_store='SDL2', args=['--cflags', '--libs']) conf.check_cfg(package='sdl2', uselib_store='SDL2', args=['--cflags', '--libs'])
@ -231,18 +232,6 @@ def configure(conf):
conf.check_cfg(package='zlib', uselib_store='ZLIB', args=['--cflags', '--libs']) conf.check_cfg(package='zlib', uselib_store='ZLIB', args=['--cflags', '--libs'])
# We restrict 64-bit builds ONLY for Win/Linux/OSX running on Intel architecture
# Because compatibility with original GoldSrc
if conf.env.DEST_OS in ['win32', 'linux', 'darwin'] and conf.env.DEST_CPU == 'x86_64':
conf.env.BIT32_MANDATORY = not conf.options.ALLOW64
if conf.env.BIT32_MANDATORY:
Logs.info('WARNING: will build engine for 32-bit target')
else:
conf.env.BIT32_MANDATORY = False
conf.load('force_32bit')
compiler_optional_flags = [ compiler_optional_flags = [
'-Wall', '-Wall',
'-fdiagnostics-color=always', '-fdiagnostics-color=always',
@ -250,7 +239,7 @@ def configure(conf):
'-Wuninitialized', '-Wuninitialized',
'-Winit-self', '-Winit-self',
'-Wstrict-aliasing', '-Wstrict-aliasing',
# '-faligned-new' '-faligned-new'
] ]
c_compiler_optional_flags = [ c_compiler_optional_flags = [