diff options
| author | Gregory Anders <8965202+gpanders@users.noreply.github.com> | 2023-11-30 13:56:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 13:56:54 -0600 |
| commit | 5e1ff4302f2b167d4f73c50c47f7ace97f442eca (patch) | |
| tree | 55f2ec9900cffa0703fb5062a3bfc3ae235ff5eb /src/nvim | |
| parent | 307d5bcc7940d14f7d17e7c2de795ebed7b0f00c (diff) | |
| parent | 5d3562d810850ee99c6352f345749d34a08a66d1 (diff) | |
| download | rneovim-5e1ff4302f2b167d4f73c50c47f7ace97f442eca.tar.gz rneovim-5e1ff4302f2b167d4f73c50c47f7ace97f442eca.tar.bz2 rneovim-5e1ff4302f2b167d4f73c50c47f7ace97f442eca.zip | |
Merge pull request #25870 from dundargoc/build/libtermkey
build: vendor libtermkey
Diffstat (limited to 'src/nvim')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/nvim/tui/input.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index a8ce9edff8..6a01632040 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -37,7 +37,6 @@ target_link_libraries(main_lib INTERFACE ${LUV_LIBRARY}) find_package(Iconv REQUIRED) find_package(Lpeg REQUIRED) -find_package(Libtermkey 0.22 REQUIRED) find_package(Libvterm 0.3.3 REQUIRED) find_package(Msgpack 1.0.0 REQUIRED) find_package(Treesitter 0.20.8 REQUIRED) @@ -45,7 +44,6 @@ find_package(Unibilium 2.0 REQUIRED) target_link_libraries(main_lib INTERFACE iconv - libtermkey libvterm msgpack treesitter @@ -60,6 +58,8 @@ if (LIBINTL_LIBRARY) target_link_libraries(main_lib INTERFACE ${LIBINTL_LIBRARY}) endif() +target_compile_definitions(main_lib INTERFACE HAVE_UNIBILIUM) + # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) if(PREFER_LUA) @@ -376,8 +376,8 @@ file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}) glob_wrapper(NVIM_SOURCES *.c) glob_wrapper(NVIM_HEADERS *.h) -glob_wrapper(EXTERNAL_SOURCES ../xdiff/*.c ../mpack/*.c ../cjson/*.c ../klib/*.c) -glob_wrapper(EXTERNAL_HEADERS ../xdiff/*.h ../mpack/*.h ../cjson/*.h ../klib/*.h) +glob_wrapper(EXTERNAL_SOURCES ../xdiff/*.c ../mpack/*.c ../cjson/*.c ../klib/*.c ../termkey/*.c) +glob_wrapper(EXTERNAL_HEADERS ../xdiff/*.h ../mpack/*.h ../cjson/*.h ../klib/*.h ../termkey/*.h) glob_wrapper(NLUA0_SOURCES ../mpack/*.c) @@ -436,13 +436,13 @@ endforeach() list(REMOVE_ITEM NVIM_SOURCES ${to_remove}) -# xdiff, mpack, lua-cjson: inlined external project, we don't maintain it. #9306 +# xdiff, mpack, lua-cjson, termkey: inlined external project, we don't maintain it. #9306 if(MSVC) set_source_files_properties( ${EXTERNAL_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -wd4090 -wd4244 -wd4267") else() set_source_files_properties( - ${EXTERNAL_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion -Wno-missing-noreturn -Wno-missing-format-attribute -Wno-double-promotion -Wno-strict-prototypes -Wno-misleading-indentation") + ${EXTERNAL_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion -Wno-missing-noreturn -Wno-missing-format-attribute -Wno-double-promotion -Wno-strict-prototypes -Wno-misleading-indentation -Wno-sign-compare -Wno-implicit-fallthrough -Wno-missing-prototypes -Wno-missing-field-initializers") endif() # Log level (NVIM_LOG_DEBUG in log.h) diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h index 2743a5e286..27a0291f5b 100644 --- a/src/nvim/tui/input.h +++ b/src/nvim/tui/input.h @@ -2,7 +2,6 @@ #include <stdbool.h> #include <stdint.h> -#include <termkey.h> #include <uv.h> #include "nvim/event/loop.h" @@ -12,6 +11,7 @@ #include "nvim/tui/input_defs.h" // IWYU pragma: export #include "nvim/tui/tui.h" #include "nvim/types_defs.h" +#include "termkey/termkey.h" typedef enum { kKeyEncodingLegacy, ///< Legacy key encoding |