generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases 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

14
lib/Makefile.Watcom
View File

@@ -30,7 +30,7 @@ RD = rmdir /q /s >NUL 2>&1
CP = copy CP = copy
CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm & 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) -dBUILDING_LIBCURL -dHAVE_SPNEGO=1 -I. -I..\include $(SYS_INCL)
#CFLAGS += -dWINBERAPI=__declspec(cdecl) -dWINLDAPAPI=__declspec(cdecl) #CFLAGS += -dWINBERAPI=__declspec(cdecl) -dWINLDAPAPI=__declspec(cdecl)
@@ -49,15 +49,15 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
# Change to suite. # Change to suite.
# #
!ifdef %zlib_root !ifdef %zlib_root
ZLIB_ROOT = $(%zlib_root) ZLIB_ROOT = $(%zlib_root)
!else !else
ZLIB_ROOT = ..\..\zlib-1.2.5 ZLIB_ROOT = ..\..\zlib-1.2.5
!endif !endif
!ifdef %ares_root !ifdef %ares_root
ARES_ROOT = $(%ares_root) ARES_ROOT = $(%ares_root)
!else !else
ARES_ROOT = ..\ares ARES_ROOT = ..\ares
!endif !endif
!ifdef %use_zlib !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) $(LD) name libcurl_wc.dll @$(LINK_ARG)
libcurl_wc.lib: $(OBJS_STAT) $(LIB_ARG) libcurl_wc.lib: $(OBJS_STAT) $(LIB_ARG)
$(AR) -q -b- c $^@ @$(LIB_ARG) $(AR) -q -b -c $^@ @$(LIB_ARG)
clean: .SYMBOLIC clean: .SYMBOLIC
-$(RM) $(OBJS_STAT) -$(RM) $(OBJS_STAT)
@@ -128,7 +128,7 @@ $(RESOURCE): libcurl.rc
.ERASE .ERASE
.c{$(OBJ_BASE)\dyn}.obj: .c{$(OBJ_BASE)\dyn}.obj:
$(CC) $(CFLAGS) $[@ -fo=$^@ $(CC) $(CFLAGS) -bd $[@ -fo=$^@
.ERASE .ERASE
.c{$(OBJ_BASE)\stat}.obj: .c{$(OBJ_BASE)\stat}.obj:

6
src/Makefile.Watcom
View File

@@ -30,7 +30,7 @@ RD = rmdir /q /s >NUL 2>&1
CP = copy CP = copy
CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm & 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) -I..\include -I..\lib $(SYS_INCL)
!ifdef %debug !ifdef %debug
@@ -61,8 +61,9 @@ CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c &
CURLX_SOURCES = rawstr.c nonblock.c CURLX_SOURCES = rawstr.c nonblock.c
OBJS = $(CURL_SOURCES:.c=.obj) OBJS = $(CURL_SOURCES:.c=.obj)
!ifndef %curl_static !ifdef %curl_static
CFLAGS += -DCURL_STATICLIB CFLAGS += -DCURL_STATICLIB
!else
OBJS += $(CURLX_SOURCES:.c=.obj) OBJS += $(CURLX_SOURCES:.c=.obj)
!endif !endif
OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\) OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\)
@@ -92,6 +93,7 @@ $(LINK_ARG): $(__MAKEFILES__)
@%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS) @%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS)
# @%append $^@ library clib3r.lib # @%append $^@ library clib3r.lib
!ifdef %curl_static !ifdef %curl_static
@%append $^@ library wldap32.lib
@%append $^@ library ..\lib\libcurl_wc.lib @%append $^@ library ..\lib\libcurl_wc.lib
!else !else
@%append $^@ library ..\lib\libcurl_wc_imp.lib @%append $^@ library ..\lib\libcurl_wc_imp.lib