From ccac3e9cfc9424f9c9434941c9ceb809d8d71f3a Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 19 Dec 2018 07:12:45 +0300 Subject: [PATCH] wscript: try to fix linking vgui on osx --- vgui_support/wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vgui_support/wscript b/vgui_support/wscript index a48ebfff..a4996137 100644 --- a/vgui_support/wscript +++ b/vgui_support/wscript @@ -43,14 +43,14 @@ def configure(conf): conf.env.LIB_VGUI = ['vgui'] conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib/win32_vc6/'))] else: + libpath = os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib')) if conf.env.DEST_OS == 'linux': conf.env.LIB_VGUI = [':vgui.so'] + conf.env.LIBPATH_VGUI = [libpath] elif conf.env.DEST_OS == 'darwin': - conf.env.LIB_VGUI = ['vgui'] - conf.parse_flags('-Wl,-rpath,', 'VGUI') + conf.env.LDFLAGS_VGUI = [os.path.join(libpath, 'vgui.dylib')] else: 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.HAVE_VGUI = 1