diff options
author | Guenter Knauf <lists@gknw.net> | 2010-08-01 00:54:40 +0200 |
---|---|---|
committer | Guenter Knauf <lists@gknw.net> | 2010-08-01 00:54:40 +0200 |
commit | 425060fed18224c7ebd260f2c7a23f3563130373 (patch) | |
tree | 0429145c0d5d1d4777552a0951f4e800fbe67d40 /src | |
parent | fbee86a9e213abb46b37c94c5861de8806f296e2 (diff) |
Added dependend libs for curl static linking.
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.Watcom | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index a475cfba4..e9639610b 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -44,6 +44,21 @@ CFLAGS += -d0 CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6 !endif +# +# Change to suite. +# +!ifdef %zlib_root +ZLIB_ROOT = $(%zlib_root) +!else +ZLIB_ROOT = ..\..\zlib-1.2.5 +!endif + +!ifdef %ares_root +ARES_ROOT = $(%ares_root) +!else +ARES_ROOT = ..\ares +!endif + OBJ_DIR = WC_Win32.obj LINK_ARG = $(OBJ_DIR)\wlink.arg @@ -95,6 +110,12 @@ $(LINK_ARG): $(__MAKEFILES__) !ifdef %curl_static @%append $^@ library wldap32.lib @%append $^@ library ..\lib\libcurl_wc.lib +!ifdef %use_zlib + @%append $^@ library $(ZLIB_ROOT)\zlib.lib +!endif +!ifdef %use_ares + @%append $^@ library $(ARES_ROOT)\cares.lib +!endif !else @%append $^@ library ..\lib\libcurl_wc_imp.lib !endif |