mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-11-22 01:45:19 +01:00
engine: wscript: always require librt on Linux since we need it for Platform_SetTimer implementation
This commit is contained in:
parent
9d8ba03f5e
commit
65bfff69d0
@ -37,8 +37,6 @@ def options(opt):
|
|||||||
def configure(conf):
|
def configure(conf):
|
||||||
# check for dedicated server build
|
# check for dedicated server build
|
||||||
if conf.options.DEDICATED:
|
if conf.options.DEDICATED:
|
||||||
if conf.env.DEST_OS == 'linux':
|
|
||||||
conf.check_cc(lib='rt')
|
|
||||||
conf.define('XASH_DEDICATED', 1)
|
conf.define('XASH_DEDICATED', 1)
|
||||||
elif conf.env.DEST_OS == 'dos':
|
elif conf.env.DEST_OS == 'dos':
|
||||||
conf.options.STATIC = True
|
conf.options.STATIC = True
|
||||||
@ -73,12 +71,9 @@ def configure(conf):
|
|||||||
# unused, XASH_LINUX without XASH_SDL gives fbdev & alsa support
|
# unused, XASH_LINUX without XASH_SDL gives fbdev & alsa support
|
||||||
# conf.define('XASH_FBDEV', 1)
|
# conf.define('XASH_FBDEV', 1)
|
||||||
conf.check_cc( lib = 'asound' )
|
conf.check_cc( lib = 'asound' )
|
||||||
conf.check_cc( lib = 'rt' )
|
|
||||||
elif conf.options.SDL12:
|
elif conf.options.SDL12:
|
||||||
conf.define('XASH_SDL', 12)
|
conf.define('XASH_SDL', 12)
|
||||||
conf.check_cfg(package='sdl', args='--cflags --libs', uselib_store='SDL2' )
|
conf.check_cfg(package='sdl', args='--cflags --libs', uselib_store='SDL2' )
|
||||||
if conf.env.DEST_OS == 'linux':
|
|
||||||
conf.check_cc( lib='rt' )
|
|
||||||
conf.env.HAVE_SDL2 = True
|
conf.env.HAVE_SDL2 = True
|
||||||
else:
|
else:
|
||||||
conf.load('sdl2')
|
conf.load('sdl2')
|
||||||
@ -97,6 +92,9 @@ def configure(conf):
|
|||||||
if not conf.env.DEST_OS in ['win32', 'android'] and not conf.options.NO_ASYNC_RESOLVE:
|
if not conf.env.DEST_OS in ['win32', 'android'] and not conf.options.NO_ASYNC_RESOLVE:
|
||||||
conf.check_pthreads()
|
conf.check_pthreads()
|
||||||
|
|
||||||
|
if conf.env.DEST_OS == 'linux':
|
||||||
|
conf.check_cc(lib='rt')
|
||||||
|
|
||||||
if hasattr(conf.options, 'DLLEMU'):
|
if hasattr(conf.options, 'DLLEMU'):
|
||||||
conf.define_cond('XASH_DLL_LOADER', conf.options.DLLEMU)
|
conf.define_cond('XASH_DLL_LOADER', conf.options.DLLEMU)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user