From cfea381c8413d8a453d202ac9815e3e8fd1673bd Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 17 Dec 2018 02:36:14 +0300 Subject: [PATCH] vgui_support: wscript: fix finding VGUI on osx, simplify sanity check --- vgui_support/wscript | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vgui_support/wscript b/vgui_support/wscript index ef6f1bcd..a48ebfff 100644 --- a/vgui_support/wscript +++ b/vgui_support/wscript @@ -46,7 +46,8 @@ def configure(conf): if conf.env.DEST_OS == 'linux': conf.env.LIB_VGUI = [':vgui.so'] elif conf.env.DEST_OS == 'darwin': - conf.env.LIB_VGUI = ['vgui.dylib'] + conf.env.LIB_VGUI = ['vgui'] + conf.parse_flags('-Wl,-rpath,', 'VGUI') 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'))] @@ -60,11 +61,8 @@ def configure(conf): conf.check_cxx( fragment=''' #include - #include int main( int argc, char **argv ) { - vgui::App *app = vgui::App::getInstance(); - app->main(argc, argv); return 0; }''', msg = 'Checking for library VGUI sanity',