romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 16:23:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed curl.exe static linking.

Browse source
This commit is contained in:
Guenter Knauf 2010-07-31 11:52:05 +02:00
parent 2f0c118577
commit fbee86a9e2
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Makefile.Watcom
View file

@ -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