diff --git a/.gitignore b/.gitignore index 4c82b07c..f78e00fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ zig-cache zig-out +/vendor/lexbor/ diff --git a/.gitmodules b/.gitmodules index 10d64d5f..26181de6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "vendor/jsruntime-lib"] path = vendor/jsruntime-lib url = https://github.com/francisbouvier/jsruntime-lib +[submodule "vendor/lexbor-src"] + path = vendor/lexbor-src + url = https://github.com/lexbor/lexbor diff --git a/Makefile b/Makefile index c38fba8d..461e0812 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,9 @@ install-dev: install-submodule install-lexbor install-jsruntime-dev ## Install and build v8 engine for dev install-lexbor: + @mkdir -p vendor/lexbor @cd vendor/lexbor && \ - cmake . -DLEXBOR_BUILD_SHARED=OFF -DLEXBOR_BUILD_STATIC=ON -DLEXBOR_BUILD_TESTS_CPP=OFF -DLEXBOR_INSTALL_HEADERS=OFF && \ + cmake ../lexbor-src -DLEXBOR_BUILD_SHARED=OFF -DLEXBOR_BUILD_STATIC=ON -DLEXBOR_BUILD_TESTS_CPP=OFF -DLEXBOR_INSTALL_HEADERS=ON && \ make install-jsruntime-dev: diff --git a/build.zig b/build.zig index 56649a37..0baab40b 100644 --- a/build.zig +++ b/build.zig @@ -78,5 +78,5 @@ fn linkLexbor(step: *std.build.LibExeObjStep) void { // cmake . -DLEXBOR_BUILD_SHARED=OFF const lib_path = "vendor/lexbor/liblexbor_static.a"; step.addObjectFile(lib_path); - step.addIncludePath("vendor/lexbor/source"); + step.addIncludePath("vendor/lexbor-src/source"); } diff --git a/vendor/lexbor-src b/vendor/lexbor-src new file mode 160000 index 00000000..b2c0a617 --- /dev/null +++ b/vendor/lexbor-src @@ -0,0 +1 @@ +Subproject commit b2c0a617f3f3ccbef9b51aa8910711b75c45f903