summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2011-04-24 18:58:07 +0200
committerGuenter Knauf <lists@gknw.net>2011-04-24 18:58:07 +0200
commit722f286f801e456c790cec0ea10306220d4969e2 (patch)
tree270b7b97b90ce83d7746c7633fd155ee443b6901
parentf20b4606deccde560efeac0829fc777a2642ad47 (diff)
downloadcurl-722f286f801e456c790cec0ea10306220d4969e2.tar.gz
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.
-rw-r--r--lib/Makefile.Watcom15
-rw-r--r--src/Makefile.Watcom8
2 files changed, 23 insertions, 0 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 41d2c302d..a780bbb28 100644
--- 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 1a9629e4b..66c97ef45 100644
--- 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