From af1eab722652e276c68642c677e3d704e69e2710 Mon Sep 17 00:00:00 2001 From: Marcin Cieslak Date: Sun, 15 Mar 2015 01:13:20 +0000 Subject: [PATCH] Build with the unbundled libsass If PKGCONFIG is set to YES in the proces environment, use pkg-config to locate system libsass to be linked. This way there is no need to checkout a src/libsass submodule at all and the library from the package management system can be used. Otherwise fallback to the bundled libsass. By default, use the bundled library. PR: 139 PR: 389 PR: 744 --- binding.gyp | 62 ++++++++----------------------- libsass.gyp | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ scripts/build.js | 6 ++- 3 files changed, 116 insertions(+), 47 deletions(-) create mode 100644 libsass.gyp diff --git a/binding.gyp b/binding.gyp index 80b9e4cc6..975adbc20 100644 --- a/binding.gyp +++ b/binding.gyp @@ -4,56 +4,26 @@ 'target_name': 'binding', 'sources': [ 'src/binding.cpp', - 'src/sass_context_wrapper.cpp', - 'src/libsass/ast.cpp', - 'src/libsass/base64vlq.cpp', - 'src/libsass/bind.cpp', - 'src/libsass/cencode.c', - 'src/libsass/constants.cpp', - 'src/libsass/context.cpp', - 'src/libsass/contextualize.cpp', - 'src/libsass/copy_c_str.cpp', - 'src/libsass/error_handling.cpp', - 'src/libsass/eval.cpp', - 'src/libsass/expand.cpp', - 'src/libsass/extend.cpp', - 'src/libsass/file.cpp', - 'src/libsass/functions.cpp', - 'src/libsass/inspect.cpp', - 'src/libsass/json.cpp', - 'src/libsass/node.cpp', - 'src/libsass/output_compressed.cpp', - 'src/libsass/output_nested.cpp', - 'src/libsass/parser.cpp', - 'src/libsass/prelexer.cpp', - 'src/libsass/remove_placeholders.cpp', - 'src/libsass/sass.cpp', - 'src/libsass/sass2scss.cpp', - 'src/libsass/sass_context.cpp', - 'src/libsass/sass_functions.cpp', - 'src/libsass/sass_util.cpp', - 'src/libsass/sass_values.cpp', - 'src/libsass/source_map.cpp', - 'src/libsass/to_c.cpp', - 'src/libsass/to_string.cpp', - 'src/libsass/units.cpp', - 'src/libsass/utf8_string.cpp', - 'src/libsass/util.cpp' + 'src/sass_context_wrapper.cpp' ], 'include_dirs': [ - '