From d964c96df8a9500e662fe3061643f8b2410d058a Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Mon, 14 May 2018 22:08:51 +0200 Subject: [PATCH 1/2] Use LuaJIT again. RTFM: Add ``` -pagezero_size 10000 -image_base 100000000 ``` when linking. (http://luajit.org/install.html) --- NvimView/NvimView.xcodeproj/project.pbxproj | 12 ++++++++++-- NvimView/local.mk | 2 -- bin/build_libnvim.sh | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/NvimView/NvimView.xcodeproj/project.pbxproj b/NvimView/NvimView.xcodeproj/project.pbxproj index 2817de25..d84f4489 100644 --- a/NvimView/NvimView.xcodeproj/project.pbxproj +++ b/NvimView/NvimView.xcodeproj/project.pbxproj @@ -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)"; }; diff --git a/NvimView/local.mk b/NvimView/local.mk index df4a6314..940fb52f 100644 --- a/NvimView/local.mk +++ b/NvimView/local.mk @@ -1,6 +1,4 @@ DISABLE_TUI := DISABLE ENABLE_CUSTOM_UI := ENABLE -DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUA=ON - CMAKE_BUILD_TYPE := Release diff --git a/bin/build_libnvim.sh b/bin/build_libnvim.sh index 5e7a63d9..e0c44edd 100755 --- a/bin/build_libnvim.sh +++ b/bin/build_libnvim.sh @@ -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" From b55c7eb65c6d989f14285a532debc659cae891ad Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Mon, 14 May 2018 22:12:11 +0200 Subject: [PATCH 2/2] Update release notes --- resources/release-notes.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/release-notes.md b/resources/release-notes.md index 911a045a..20a7a16b 100644 --- a/resources/release-notes.md +++ b/resources/release-notes.md @@ -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)