Commit 722f286f authored by Guenter Knauf's avatar Guenter Knauf
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.
parent f20b4606

lib/Makefile.Watcom

+15 −0
Original line number Diff line number Diff line
@@ -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 $^@

src/Makefile.Watcom

+8 −0
Original line number Diff line number Diff line
@@ -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