diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2011-08-10 03:29:02 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-08-10 03:29:02 +0200 |
| commit | 5da497e0e86798194907baebd420bb56c1611209 (patch) | |
| tree | 8bd8e048f197c4f557b009199fc89e3ad29ea8c1 /Makefile.Watcom | |
| parent | a94b4e53d1b18cd15a9c27808b71ab665ebfad2d (diff) | |
| download | c-ares-5da497e0e86798194907baebd420bb56c1611209.tar.gz c-ares-5da497e0e86798194907baebd420bb56c1611209.tar.bz2 c-ares-5da497e0e86798194907baebd420bb56c1611209.zip | |
Makefile.Watcom:
* The 'NTDDI_VERSION' needs to be raised to 0x05010000
in order for SOCKADDR_STORAGE etc. to be typedefed.
* Replaced '-dUSE_WATT32' with '-dWATT32'.
* Added $(DEMOS) to the 'all' target and removed the 'demos'
target to be consistent with e.g. Makefile.msvc etc.
* 'ENABLE_IPV6' is no longer used. Hence removed the '%use_ipv6' construct.
* object-file order seems to be important (Watcom v.19). Hence
'ares_getopt.obj' must be put after the .obj that references getopt().
Diffstat (limited to 'Makefile.Watcom')
| -rw-r--r-- | Makefile.Watcom | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Makefile.Watcom b/Makefile.Watcom index 643155d..7a450a0 100644 --- a/Makefile.Watcom +++ b/Makefile.Watcom @@ -40,7 +40,7 @@ CP = copy CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm & -wcd=201 -bt=nt -d+ -dWIN32 -dCARES_BUILDING_LIBRARY & - -dNTDDI_VERSION=0x05000100 -I. $(SYS_INCL) + -dNTDDI_VERSION=0x05010000 -I. $(SYS_INCL) LFLAGS = option quiet, map, caseexact, eliminate @@ -52,15 +52,13 @@ LFLAGS += debug all CFLAGS += -d0 !endif -!ifdef %use_ipv6 -CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6 -!endif +CFLAGS += -d_WIN32_WINNT=0x0501 # # Change to suite. # !ifdef %use_watt32 -CFLAGS += -dUSE_WATT32 -I$(%watt_root)\inc +CFLAGS += -dWATT32 -I$(%watt_root)\inc !endif OBJ_BASE = WC_Win32.obj @@ -89,12 +87,9 @@ OBJS_DYN = $+ $(OBJS) $- ARESBUILDH = ares_build.h RESOURCE = $(OBJ_BASE)\dyn\cares.res -all: $(ARESBUILDH) $(OBJ_BASE) $(TARGETS) .SYMBOLIC +all: $(ARESBUILDH) $(OBJ_BASE) $(TARGETS) $(DEMOS) .SYMBOLIC @echo Welcome to cares -demos: all $(DEMOS) .SYMBOLIC - @echo Welcome to cares-demos - $(OBJ_BASE): -$(MD) $^@ -$(MD) $^@\stat @@ -111,13 +106,13 @@ $(LIBNAME).lib: $(OBJS_STAT) $(LIB_ARG) $(AR) -q -b -c $^@ @$]@ adig.exe: $(OBJ_BASE)\demos\adig.obj $(OBJ_BASE)\demos\ares_getopt.obj $(LIBNAME).lib - $(LD) name $^@ system nt $(LFLAGS) file { $[@ $(OBJ_BASE)\demos\ares_getopt.obj } library $]@, ws2_32.lib + $(LD) name $^@ system nt $(LFLAGS) file { $(OBJ_BASE)\demos\ares_getopt.obj $[@ } library $]@, ws2_32.lib ahost.exe: $(OBJ_BASE)\demos\ahost.obj $(OBJ_BASE)\demos\ares_getopt.obj $(LIBNAME).lib - $(LD) name $^@ system nt $(LFLAGS) file { $[@ $(OBJ_BASE)\demos\ares_getopt.obj } library $]@, ws2_32.lib + $(LD) name $^@ system nt $(LFLAGS) file { $(OBJ_BASE)\demos\ares_getopt.obj $[@ } library $]@, ws2_32.lib acountry.exe: $(OBJ_BASE)\demos\acountry.obj $(OBJ_BASE)\demos\ares_getopt.obj $(LIBNAME).lib - $(LD) name $^@ system nt $(LFLAGS) file { $[@ $(OBJ_BASE)\demos\ares_getopt.obj } library $]@, ws2_32.lib + $(LD) name $^@ system nt $(LFLAGS) file { $(OBJ_BASE)\demos\ares_getopt.obj $[@ } library $]@, ws2_32.lib clean: .SYMBOLIC -$(RM) $(OBJS_STAT) |