Permalink
Browse files

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.
  • Loading branch information...
gknauf committed Apr 24, 2011
1 parent f20b460 commit 722f286f801e456c790cec0ea10306220d4969e2
Showing with 23 additions and 0 deletions.
  1. +15 −0 lib/Makefile.Watcom
  2. +8 −0 src/Makefile.Watcom
View
@@ -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 $^@
View
@@ -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

0 comments on commit 722f286

Please sign in to comment.