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

vgui_support: wscript: fix finding VGUI on osx, simplify sanity check

Browse Source
This commit is contained in:
Alibek Omarov 2018-12-17 02:36:14 +03:00
parent bd7e2fe88d
commit cfea381c84
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vgui_support/wscript
View File

@ -46,7 +46,8 @@ def configure(conf):
if conf.env.DEST_OS == 'linux': if conf.env.DEST_OS == 'linux':
conf.env.LIB_VGUI = [':vgui.so'] conf.env.LIB_VGUI = [':vgui.so']
elif conf.env.DEST_OS == 'darwin': elif conf.env.DEST_OS == 'darwin':
conf.env.LIB_VGUI = ['vgui.dylib'] conf.env.LIB_VGUI = ['vgui']
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.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib'))]
@ -60,11 +61,8 @@ def configure(conf):
conf.check_cxx( conf.check_cxx(
fragment=''' fragment='''
#include <VGUI.h> #include <VGUI.h>
#include <VGUI_App.h>
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
vgui::App *app = vgui::App::getInstance();
app->main(argc, argv);
return 0; return 0;
}''', }''',
msg = 'Checking for library VGUI sanity', msg = 'Checking for library VGUI sanity',