mirror of
https://github.com/qvacua/vimr.git
synced 2024-12-25 14:52:19 +03:00
Merge remote-tracking branch 'origin/develop' into update-neovim
This commit is contained in:
commit
9797c4f1a8
@ -612,11 +612,15 @@
|
||||
"-lutil",
|
||||
"$(PROJECT_DIR)/third-party/libintl/lib/libintl.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libjemalloc.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/liblua.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libluajit-5.1.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libvterm.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libuv.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libmsgpackc.a",
|
||||
"$(PROJECT_DIR)/neovim/build/lib/libnvim.a",
|
||||
"-image_base",
|
||||
100000000,
|
||||
"-pagezero_size",
|
||||
10000,
|
||||
);
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
};
|
||||
@ -646,11 +650,15 @@
|
||||
"-lutil",
|
||||
"$(PROJECT_DIR)/third-party/libintl/lib/libintl.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libjemalloc.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/liblua.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libluajit-5.1.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libvterm.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libuv.a",
|
||||
"$(PROJECT_DIR)/neovim/.deps/usr/lib/libmsgpackc.a",
|
||||
"$(PROJECT_DIR)/neovim/build/lib/libnvim.a",
|
||||
"-image_base",
|
||||
100000000,
|
||||
"-pagezero_size",
|
||||
10000,
|
||||
);
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
};
|
||||
|
@ -1,6 +1,4 @@
|
||||
DISABLE_TUI := DISABLE
|
||||
ENABLE_CUSTOM_UI := ENABLE
|
||||
|
||||
DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUA=ON
|
||||
|
||||
CMAKE_BUILD_TYPE := Release
|
||||
|
@ -11,7 +11,7 @@ ln -sf ../local.mk .
|
||||
# to get the full runtime.
|
||||
make CFLAGS='-mmacosx-version-min=10.10' \
|
||||
MACOSX_DEPLOYMENT_TARGET=10.10 \
|
||||
CMAKE_EXTRA_FLAGS="-DGETTEXT_SOURCE=CUSTOM -DPREFER_LUA=ON" \
|
||||
CMAKE_EXTRA_FLAGS="-DGETTEXT_SOURCE=CUSTOM" \
|
||||
libnvim
|
||||
|
||||
echo "### Built libnvim"
|
||||
|
@ -1,3 +1,8 @@
|
||||
# next
|
||||
|
||||
* Some refactorings for the Neovim and the UI interface.
|
||||
* Use LuaJIT again.
|
||||
|
||||
# 0.23.0-275
|
||||
|
||||
* GH-419: File browser sorts folders on the top. (Thanks @laibulle for the PR)
|
||||
|
Loading…
Reference in New Issue
Block a user