improve xmake.sh

Author: waruqi

core/xmake.lua

@@ -101,7 +101,7 @@ option("curses")
             option:add("links", "ncursesw")
         elseif is_plat("macosx") then
             option:add("cincludes", "curses.h")
-            option:add("links", "ncurses")
+            option:add("links", "curses")
         else
             option:add("cincludes", "curses.h")
             option:add("links", "curses")

core/xmake.sh

@@ -65,14 +65,25 @@ option_find_curses() {
     if is_plat "mingw"; then
         ncurses="ncursesw"
     fi
+    # try to find homebrew ncurses pkgconfig path on macOS (keg-only)
+    local ncurses_pkg_config_path="${PKG_CONFIG_PATH}"
+    if is_host "macosx"; then
+        local brew_ncurses_pkgconfig=""
+        if test -d "/usr/local/opt/ncurses/lib/pkgconfig"; then
+            brew_ncurses_pkgconfig="/usr/local/opt/ncurses/lib/pkgconfig"
+        elif test -d "/opt/homebrew/opt/ncurses/lib/pkgconfig"; then
+            brew_ncurses_pkgconfig="/opt/homebrew/opt/ncurses/lib/pkgconfig"
+        fi
+        if test_nz "${brew_ncurses_pkgconfig}"; then
+            ncurses_pkg_config_path="${brew_ncurses_pkgconfig}:${PKG_CONFIG_PATH}"
+        fi
+    fi
     local ncurses_ldflags=""
-    ncurses_ldflags=$(pkg-config --libs ${ncurses} 2>/dev/null)
+    ncurses_ldflags=$(PKG_CONFIG_PATH="${ncurses_pkg_config_path}" pkg-config --libs ${ncurses} 2>/dev/null)
     option "curses"
         if test_nz "${ncurses_ldflags}"; then
-            add_cflags `pkg-config --cflags ${ncurses} 2>/dev/null`
+            add_cflags `PKG_CONFIG_PATH="${ncurses_pkg_config_path}" pkg-config --cflags ${ncurses} 2>/dev/null`
             add_ldflags "${ncurses_ldflags}"
-        elif is_plat "macosx"; then
-            add_links "ncurses"
         else
             add_links "curses"
         fi