diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/os/fs.c | 1 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dfd0764a94..a7e815fd7c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,16 @@ file( GLOB OS_SOURCES os/*.c ) add_executable (nvim ${NEOVIM_SOURCES} ${OS_SOURCES}) -target_link_libraries (nvim m uv ${CMAKE_THREAD_LIBS_INIT}) +# The libraries we link against for nvim +set(NVIM_LINK_LIBRARIES m ${LibUV_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + +# Add any libraries needed for a specific platform +if(HAVE_CLOCK_GETTIME) + # Work around libuv.a not linking in rt. + list(APPEND NVIM_LINK_LIBRARIES rt) +endif(HAVE_CLOCK_GETTIME) + +target_link_libraries (nvim ${NVIM_LINK_LIBRARIES}) include(CheckLibraryExists) check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP) @@ -30,6 +39,6 @@ else() endif() endif() -include_directories ("${PROJECT_SOURCE_DIR}/src/proto") +include_directories ("${PROJECT_SOURCE_DIR}/src/proto") install(TARGETS nvim RUNTIME DESTINATION bin) diff --git a/src/main.c b/src/main.c index 418c579209..c5d7d528cf 100644 --- a/src/main.c +++ b/src/main.c @@ -966,9 +966,7 @@ static void parse_command_name(mparm_T *parmp) } } -static bool parse_char_i(input, val) - char_u **input; - char val; +static bool parse_char_i(char_u **input, char val) { if (TOLOWER_ASC(**input) == val) { *input += 1; /* or (*input)++ WITH parens */ diff --git a/src/os/fs.c b/src/os/fs.c index 3529ab4f46..bc9a495984 100644 --- a/src/os/fs.c +++ b/src/os/fs.c @@ -15,6 +15,7 @@ #include "os.h" #include "../message.h" +#include "../misc2.h" int mch_chdir(char *path) { if (p_verbose >= 5) { |