Bellow is what you pprobably want diff -ud with smapshot date

--- curl-7.21.1-20100810\lib\makefile.watcom 2010-08-08 04:00:04.000000000
+0200
+++ curl-7.21.1-20100810\patch_lib\makefile.watcom 2010-08-10
09:47:55.242017600 +0200
@@ -26,6 +26,11 @@
 ! loaddll wcc386 wccd386
 ! loaddll wpp386 wppd386
 ! loaddll wlib wlibd
+! if $(__VERSION__) > 1270
+! loaddll wlink wlinkd
+! else
+! loaddll wlink wlink
+! endif
 !endif

 MD = mkdir
@@ -135,7 +140,7 @@

 .ERASE
 .c{$(OBJ_BASE)\dyn}.obj:
- $(CC) $(CFLAGS) -bd $[@ -fo=$^@
+ $(CC) $(CFLAGS) -bd -br $[@ -fo=$^@

 .ERASE
 .c{$(OBJ_BASE)\stat}.obj:
@@ -143,11 +148,14 @@

 $(LINK_ARG): $(__MAKEFILES__)
  %create $^@
+!ifdef %debug
+ @%append $^@ debug all
+ @%append $^@ option symfile
+!endif
  @%append $^@ system nt dll
  @%append $^@ file { $(OBJS_DYN) }
  @%append $^@ option quiet, map, caseexact, eliminate,
implib=$(LIBNAME)_imp.lib,
  @%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS)
-# @%append $^@ library clib3r.lib
  @%append $^@ library wldap32.lib
 !ifdef %use_watt32
  @%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib

--- curl-7.21.1-20100810\src\makefile.watcom 2010-08-08 04:00:04.000000000
+0200
+++ curl-7.21.1-20100810\patch_src\makefile.watcom 2010-08-10
09:50:16.618827200 +0200
@@ -26,6 +26,11 @@
 ! loaddll wcc386 wccd386
 ! loaddll wpp386 wppd386
 ! loaddll wlib wlibd
+! if $(__VERSION__) > 1270
+! loaddll wlink wlinkd
+! else
+! loaddll wlink wlink
+! endif
 !endif

 MD = mkdir
@@ -80,6 +85,7 @@
 !ifdef %curl_static
 CFLAGS += -DCURL_STATICLIB
 !else
+CFLAGS += -br
 OBJS += $(CURLX_SOURCES:.c=.obj)
 !endif
 OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\)
@@ -121,11 +127,14 @@

 $(LINK_ARG): $(__MAKEFILES__)
  %create $^@
+!ifdef %debug
+ @%append $^@ debug all
+ @%append $^@ option symfile
+!endif
  @%append $^@ system nt
  @%append $^@ file { $(OBJS) }
  @%append $^@ option quiet, map, caseexact, eliminate,
  @%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS)
-# @%append $^@ library clib3r.lib
 !ifdef %curl_static
  @%append $^@ library wldap32.lib
  @%append $^@ library ..\lib\$(LIBNAME).lib
Jiri

2010/8/10 Jiri Malak <malak.jiri_at_gmail.com>

> Hi Dan,
>
> I have no GIT installed.
> I did it against today snapshot with -u option from my local copy.
> Regards
>
> Jiri
> 2010/8/10 Dan Fandrich <dan_at_coneharvesters.com>
>
> On Tue, Aug 10, 2010 at 08:41:30AM +0200, Jiri Malak wrote:
>> > Bellow I enclosed patchs to existing Open Watcom makefile to fix a few
>> > problems.
>> >
>> > - Missing -br option for DLL version
>> >
>> > - Missing debug info if create debug version
>> >
>> > - Use DLL version of OW linker
>>
>>
>> Can you recreate that diff with the -u option? The standard diff output
>> is useless without knowing exactly what version of the original file is
>> being compared. Note also that the Watcom makefile was extensively changed
>> a week or so ago in git.
>>
>> >>> Dan
>> -------------------------------------------------------------------
>> List admin: http://cool.haxx.se/list/listinfo/curl-library
>> Etiquette: http://curl.haxx.se/mail/etiquette.html
>>
>
>

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2010-08-10