moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 20:15:03 -05:00
Code Issues Releases Wiki Activity

Fix to overwrite libcurl name.

Browse Source
This commit is contained in:
Guenter Knauf 2010-08-07 18:32:39 +02:00
parent af4eae77ac
commit 6ea043a504
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Makefile.Watcom
View File

@ -10,15 +10,17 @@ SYS_INCL = -I$(%watcom)\h\nt -I$(%watcom)\h
SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386 SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386
!endif !endif
!ifndef %libname !ifdef %libname
LIBNAME = $(%libname)
!else
LIBNAME = libcurl LIBNAME = libcurl
!endif !endif
TARGETS = $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib TARGETS = $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib
CC = wcc386 CC = wcc386
LD = wlink LD = wlink
RC = wrc
AR = wlib AR = wlib
RC = wrc
!ifdef __LOADDLL__ !ifdef __LOADDLL__
! loaddll wcc386 wccd386 ! loaddll wcc386 wccd386

13
src/Makefile.Watcom
View File

@ -10,12 +10,17 @@ SYS_INCL = -I$(%watcom)\h\nt -I$(%watcom)\h
SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386 SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386
!endif !endif
TARGETS = libcurl_wc.dll libcurl_wc_imp.lib libcurl_wc.lib !ifdef %libname
LIBNAME = $(%libname)
!else
LIBNAME = libcurl
!endif
TARGETS = $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib
CC = wcc386 CC = wcc386
LD = wlink LD = wlink
RC = wrc
AR = wlib AR = wlib
RC = wrc
!ifdef __LOADDLL__ !ifdef __LOADDLL__
! loaddll wcc386 wccd386 ! loaddll wcc386 wccd386
@ -123,7 +128,7 @@ $(LINK_ARG): $(__MAKEFILES__)
# @%append $^@ library clib3r.lib # @%append $^@ library clib3r.lib
!ifdef %curl_static !ifdef %curl_static
@%append $^@ library wldap32.lib @%append $^@ library wldap32.lib
@%append $^@ library ..\lib\libcurl.lib @%append $^@ library ..\lib\$(LIBNAME).lib
!ifdef %use_zlib !ifdef %use_zlib
@%append $^@ library $(ZLIB_ROOT)\zlib.lib @%append $^@ library $(ZLIB_ROOT)\zlib.lib
!endif !endif
@ -131,7 +136,7 @@ $(LINK_ARG): $(__MAKEFILES__)
@%append $^@ library $(ARES_ROOT)\cares.lib @%append $^@ library $(ARES_ROOT)\cares.lib
!endif !endif
!else !else
@%append $^@ library ..\lib\libcurl_imp.lib @%append $^@ library ..\lib\$(LIBNAME)_imp.lib
!endif !endif
!ifeq USE_WATT32 1 !ifeq USE_WATT32 1
@%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib @%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib