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

wscript: try to fix linking vgui on osx

Browse Source
This commit is contained in:
Alibek Omarov 2018-12-19 07:12:45 +03:00
parent aac44ef866
commit ccac3e9cfc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vgui_support/wscript
View File

@ -43,14 +43,14 @@ def configure(conf):
conf.env.LIB_VGUI = ['vgui'] conf.env.LIB_VGUI = ['vgui']
conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib/win32_vc6/'))] conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib/win32_vc6/'))]
else: else:
libpath = os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib'))
if conf.env.DEST_OS == 'linux': if conf.env.DEST_OS == 'linux':
conf.env.LIB_VGUI = [':vgui.so'] conf.env.LIB_VGUI = [':vgui.so']
conf.env.LIBPATH_VGUI = [libpath]
elif conf.env.DEST_OS == 'darwin': elif conf.env.DEST_OS == 'darwin':
conf.env.LIB_VGUI = ['vgui'] conf.env.LDFLAGS_VGUI = [os.path.join(libpath, 'vgui.dylib')]
conf.parse_flags('-Wl,-rpath,', 'VGUI')
else: else:
conf.fatal('vgui is not supported on this OS: ' + conf.env.DEST_OS) conf.fatal('vgui is not supported on this OS: ' + conf.env.DEST_OS)
conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib'))]
conf.env.INCLUDES_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'include'))] conf.env.INCLUDES_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'include'))]
conf.env.HAVE_VGUI = 1 conf.env.HAVE_VGUI = 1