bring terminfo back into windows build #2014

dankamongmen · Aug 5, 2021 · dd8700b · dd8700b
1 parent a77adfa
commit dd8700b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml
@@ -33,6 +33,7 @@ jobs:
             mingw-w64-ucrt-x86_64-doctest
             mingw-w64-ucrt-x86_64-ffmpeg
             mingw-w64-ucrt-x86_64-libunistring
+            mingw-w64-ucrt-x86_64-ncurses
             mingw-w64-ucrt-x86_64-rust
             mingw-w64-ucrt-x86_64-toolchain
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,7 +103,6 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 endif()
 # some distros (<cough>motherfucking alpine</cough> subsume terminfo directly
 # into ncurses. accept either, and may god have mercy on our souls.
-if(NOT WIN32)
 pkg_search_module(TERMINFO REQUIRED tinfo>=6.1 ncursesw>=6.1)
 set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND terminfo)
 set_package_properties(terminfo PROPERTIES TYPE REQUIRED)

diff --git a/src/lib/internal.h b/src/lib/internal.h
@@ -12,6 +12,8 @@ extern "C" {
 #include <term.h>
 #include <ncurses.h>
 #include <time.h>
+#include <term.h>
+#include <ncurses.h> // needed for some definitions, see terminfo(3ncurses)
 #include <stdio.h>
 #include <stdint.h>
 #include <unistd.h>