diff options
| author | Guenter Knauf <lists@gknw.net> | 2010-07-31 11:52:05 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2010-07-31 11:52:05 +0200 |
| commit | fbee86a9e213abb46b37c94c5861de8806f296e2 (patch) | |
| tree | 4f54f07eb3e5a5c1fc93cad1f89c76faadb95b2e | |
| parent | 2f0c1185776f3483cb042c699dc52f5a4662079e (diff) | |
Fixed curl.exe static linking.
| -rw-r--r-- | lib/Makefile.Watcom | 14 | ||||
| -rw-r--r-- | src/Makefile.Watcom | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index f590f416f..2f74a20cc 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -30,7 +30,7 @@ RD = rmdir /q /s >NUL 2>&1 CP = copy CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm & - -wcd=201 -bt=nt -bd -d+ -dWIN32 -dCURL_WANTS_CA_BUNDLE_ENV & + -wcd=201 -bt=nt -d+ -dWIN32 -dCURL_WANTS_CA_BUNDLE_ENV & -dBUILDING_LIBCURL -dHAVE_SPNEGO=1 -I. -I..\include $(SYS_INCL) #CFLAGS += -dWINBERAPI=__declspec(cdecl) -dWINLDAPAPI=__declspec(cdecl) @@ -49,15 +49,15 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6 # Change to suite. # !ifdef %zlib_root -ZLIB_ROOT = $(%zlib_root) +ZLIB_ROOT = $(%zlib_root) !else -ZLIB_ROOT = ..\..\zlib-1.2.5 +ZLIB_ROOT = ..\..\zlib-1.2.5 !endif !ifdef %ares_root -ARES_ROOT = $(%ares_root) +ARES_ROOT = $(%ares_root) !else -ARES_ROOT = ..\ares +ARES_ROOT = ..\ares !endif !ifdef %use_zlib @@ -109,7 +109,7 @@ libcurl_wc.dll libcurl_wc_imp.lib: $(OBJS_DYN) $(RESOURCE) $(LINK_ARG) $(LD) name libcurl_wc.dll @$(LINK_ARG) libcurl_wc.lib: $(OBJS_STAT) $(LIB_ARG) - $(AR) -q -b- c $^@ @$(LIB_ARG) + $(AR) -q -b -c $^@ @$(LIB_ARG) clean: .SYMBOLIC -$(RM) $(OBJS_STAT) @@ -128,7 +128,7 @@ $(RESOURCE): libcurl.rc .ERASE .c{$(OBJ_BASE)\dyn}.obj: - $(CC) $(CFLAGS) $[@ -fo=$^@ + $(CC) $(CFLAGS) -bd $[@ -fo=$^@ .ERASE .c{$(OBJ_BASE)\stat}.obj: diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 39a387ef7..a475cfba4 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -30,7 +30,7 @@ RD = rmdir /q /s >NUL 2>&1 CP = copy CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm & - -wcd=201 -bt=nt -d+ -dWIN32 -dHAVE_STRTOLL & + -wcd=201 -bt=nt -bc -d+ -dWIN32 -dHAVE_STRTOLL & -I..\include -I..\lib $(SYS_INCL) !ifdef %debug @@ -61,8 +61,9 @@ CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c & CURLX_SOURCES = rawstr.c nonblock.c OBJS = $(CURL_SOURCES:.c=.obj) -!ifndef %curl_static +!ifdef %curl_static CFLAGS += -DCURL_STATICLIB +!else OBJS += $(CURLX_SOURCES:.c=.obj) !endif OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\) @@ -92,6 +93,7 @@ $(LINK_ARG): $(__MAKEFILES__) @%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS) # @%append $^@ library clib3r.lib !ifdef %curl_static + @%append $^@ library wldap32.lib @%append $^@ library ..\lib\libcurl_wc.lib !else @%append $^@ library ..\lib\libcurl_wc_imp.lib |