Move libcxx routines to vendor folder

maxbrunsfeld · maxbrunsfeld · commit 633c375f87fb · 2017-06-19T14:15:23.000-07:00
Also, include them in the .npmignore file properly
diff --git a/.npmignore b/.npmignore
@@ -8,8 +8,7 @@
 !src/bindings/*.h
 !src/bindings/*.cc
 
-!vendor/diff-match-patch/diff_match_patch.h
-!vendor/diff-match-patch/LICENSE
+!vendor/libcxx/*
 
 !vendor/pcre/pcre.gyp
 !vendor/pcre/pcre2_chartables.c
diff --git a/binding.gyp b/binding.gyp
@@ -40,6 +40,9 @@
                 "src/core/text-diff.cc",
                 "src/core/libmba-diff.cc",
             ],
+            "include_dirs": [
+                "vendor/libcxx"
+            ],
             "conditions": [
                 ['OS=="mac"', {
                     'link_settings': {
diff --git a/script/build-browser-version.sh b/script/build-browser-version.sh
@@ -42,6 +42,7 @@ em++                                    \
   -O3                                   \
   -I src/bindings/em                    \
   -I src/core                           \
+  -I vendor/libcxx                      \
   -I vendor/pcre/include                \
   -D PCRE2_CODE_UNIT_WIDTH=16           \
   -xc++                                 \
diff --git a/src/core/encoding-conversion.cc b/src/core/encoding-conversion.cc
@@ -1,5 +1,5 @@
 #include "encoding-conversion.h"
-#include "libcxx-components/utf8-conversions.h"
+#include "utf8-conversions.h"
 #include <iconv.h>
 #include <string.h>
 
diff --git a/vendor/libcxx/LICENSE.txt b/vendor/libcxx/LICENSE.txt
diff --git a/vendor/libcxx/utf8-conversions.h b/vendor/libcxx/utf8-conversions.h
