Enabled OpenWatcom native Windows IDN build.

For now we directly import the Idn* symbols with the linker;
an upcoming release of OWC will have these added to the import
lib normaliz.lib, and prototypes are added to winnnls.h.

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 41d2c302d6c9b7763a199e871f7315591377f247..a780bbb2872acbfc1efb8ee52fa3071c33b07e88 100644 (file)
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -70,6 +70,13 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
 CFLAGS += -dUSE_WINDOWS_SSPI
 !endif
 
+!ifdef %use_winidn
+CFLAGS += -dWINVER=0x0600 -dUSE_WIN32_IDN
+!  if $(__VERSION__) <= 1290
+CFLAGS += -dWANT_IDN_PROTOTYPES
+!  endif
+!endif
+
 #
 # Change to suite.
 #
@@ -229,6 +236,14 @@ $(LINK_ARG): $(__MAKEFILES__)
 !ifdef %use_ares
        @%append $^@ library $(ARES_ROOT)$(DS)cares.lib
 !endif
+!ifdef %use_winidn
+!  if $(__VERSION__) > 1290
+       @%append $^@ library normaliz.lib
+!  else
+       @%append $^@ import '_IdnToAscii@20' 'NORMALIZ.DLL'.'IdnToAscii'
+       @%append $^@ import '_IdnToUnicode@20' 'NORMALIZ.DLL'.'IdnToUnicode'
+!  endif
+!endif
 
 $(LIB_ARG): $(__MAKEFILES__)
        %create $^@

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 1a9629e4ba83e87abb6c8c39c70999c3a150c94f..66c97ef459e4327d47d158968156ead4c9969190 100644 (file)
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -193,6 +193,14 @@ $(LINK_ARG): $(__MAKEFILES__)
 !ifdef %use_ares
        @%append $^@ library $(ARES_ROOT)$(DS)cares.lib
 !endif
+!ifdef %use_winidn
+!  if $(__VERSION__) > 1290
+       @%append $^@ library normaliz.lib
+!  else
+       @%append $^@ import '_IdnToAscii@20' 'NORMALIZ.DLL'.'IdnToAscii'
+       @%append $^@ import '_IdnToUnicode@20' 'NORMALIZ.DLL'.'IdnToUnicode'
+!  endif
+!endif
 !else
        @%append $^@ library ..$(DS)lib$(DS)$(LIBNAME)_imp.lib
 !endif