diff options
Diffstat (limited to 'mk-1st.awk')
| -rw-r--r-- | mk-1st.awk | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/mk-1st.awk b/mk-1st.awk index 480baad67ec8..74bc2ebe8384 100644 --- a/mk-1st.awk +++ b/mk-1st.awk @@ -1,4 +1,4 @@ -# $Id: mk-1st.awk,v 1.106 2020/02/02 23:34:34 tom Exp $ +# $Id: mk-1st.awk,v 1.109 2020/08/31 23:49:24 tom Exp $ ############################################################################## # Copyright 2018,2020 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # @@ -75,7 +75,9 @@ function lib_name_of(a_name) { function imp_name_of(a_name) { if (ShlibVerInfix == "cygdll" || ShlibVerInfix == "msysdll" || ShlibVerInfix == "mingw") { result = sprintf("%s%s%s.a", prefix, a_name, suffix); - } else { + } else if (ShlibVerInfix == "msvcdll") { + result = sprintf("%s%s%s.lib", prefix, a_name, suffix); + } else{ result = ""; } return result; @@ -86,7 +88,7 @@ function abi_name_of(a_name) { result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix); } else if (ShlibVerInfix == "msysdll") { result = sprintf("%s%s$(ABI_VERSION)%s", "msys-", a_name, suffix); - } else if (ShlibVerInfix == "mingw") { + } else if (ShlibVerInfix == "mingw" || ShlibVerInfix == "msvcdll") { result = sprintf("%s%s$(ABI_VERSION)%s", prefix, a_name, suffix); } else if (ShlibVerInfix == "yes") { result = sprintf("%s%s.$(ABI_VERSION)%s", prefix, a_name, suffix); @@ -101,7 +103,7 @@ function rel_name_of(a_name) { result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix); } else if (ShlibVerInfix == "msysdll") { result = sprintf("%s%s$(ABI_VERSION)%s", "msys-", a_name, suffix); - } else if (ShlibVerInfix == "mingw") { + } else if (ShlibVerInfix == "mingw" || ShlibVerInfix == "msvcdll") { result = sprintf("%s%s$(REL_VERSION)%s", prefix, a_name, suffix); } else if (ShlibVerInfix == "yes") { result = sprintf("%s%s.$(REL_VERSION)%s", prefix, a_name, suffix); @@ -119,7 +121,7 @@ function end_name_of(a_name) { } else { if ( ShlibVer == "rel" ) { result = rel_name_of(a_name); - } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" ) { + } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll" ) { result = abi_name_of(a_name); } else { result = lib_name_of(a_name); @@ -175,7 +177,7 @@ function make_shlib(objs, shlib_list) { printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s)\n", objs, shlib_list } function sharedlinks(directory) { - if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "msysdll" && ShlibVer != "mingw" ) { + if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "msysdll" && ShlibVer != "mingw" && ShlibVer != "msvcdll" ) { printf "\tcd %s && (", directory if ( DoLinks == "reverse" ) { if ( ShlibVer == "rel" ) { @@ -257,6 +259,13 @@ function install_dll(directory,filename) { } printf "\t%s %s %s\n", program, src_name, dst_name } +function in_subset(value) { + value = " " value " "; + check = subset; + gsub("[+]", " ", check); + check = " " check " "; + return index(check,value); + } BEGIN { TOOL_PREFIX = ""; found = 0; @@ -266,7 +275,7 @@ BEGIN { using = 0 if (subset == "none") { using = 1 - } else if (index(subset,$2) > 0) { + } else if (in_subset($2) > 0) { if (using == 0) { if (found == 0) { if ( name ~ /^.*\+\+.*/ ) { @@ -375,7 +384,7 @@ END { print "install \\" print "install.libs \\" - if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw") { + if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") { dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)"; printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs @@ -396,8 +405,13 @@ END { if ( overwrite == "yes" && name == "ncurses" ) { - if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw") { - ovr_name = sprintf("libcurses%s.a", suffix) + if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || SlibVer == "msvcdll") { + if (ShlibVer == "msvcdll") { + curses_prefix = "" + } else { + curses_prefix = "lib" + } + ovr_name = sprintf("%scurses%s.a", curses_prefix, suffix) printf "\t@echo linking %s to %s\n", imp_name, ovr_name printf "\tcd $(DESTDIR)$(libdir) && (" symlink(imp_name, ovr_name) @@ -417,7 +431,7 @@ END { print "uninstall \\" print "uninstall.libs \\" printf "uninstall.%s ::\n", name - if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw") { + if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" || ShlibVer == "msvcdll") { printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name |