From 9227f25e9c4eaf19bc6886f23751c71e2d2b9c64 Mon Sep 17 00:00:00 2001 From: ThePhD Date: Thu, 25 Feb 2016 03:43:12 -0500 Subject: [PATCH] Not very good at argparse... --- bootstrap.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bootstrap.py b/bootstrap.py index 048d6656..31ee09a3 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -66,6 +66,9 @@ if sys.platform == 'win32': remove_command = 'rmdir /S /Q {} && erase /F /S /Q /A {}'.format(os.path.join(args.install_dir, 'sol'), os.path.join(args.install_dir, 'sol.hpp')) +if not args.lua_lib: + args.lua_lib = 'lua' + if args.debug: cxxflags.extend(['-g', '-O0']) else: @@ -79,13 +82,13 @@ if args.lua_dir: ldflags.extend(library_includes([os.path.join(args.lua_dir, 'lib')])) if args.lua_lib: - include.extend([os.path.join(args.lua_dir, 'include')]) - ldflags.extend(library_includes([os.path.join(args.lua_dir, 'lib')])) + ldflags.extend(libraries([args.lua_lib])) -ldflags.extend(libraries([args.lua_lib])) if args.ci: ldflags.extend(library_includes(['lib'])) - include.extend(['/usr/include/' + args.lua_lib, './include']) + include.extend(['./include']) + if args.lua_lib: + include.extend(['/usr/include/' + args.lua_lib, './include']) cxxflags.extend(['-std=c++1y']) else: cxxflags.extend(['-std=c++14'])