| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles) | |||
| 12 | 12 | INCLUDE (CheckStructHasMember) | |
| 13 | 13 | INCLUDE (CheckLibraryExists) | |
| 14 | 14 | ||
| 15 | - PROJECT (c-ares LANGUAGES C VERSION "1.30.0" ) | ||
| 15 | + PROJECT (c-ares LANGUAGES C VERSION "1.31.0" ) | ||
| 16 | 16 | ||
| 17 | 17 | # Set this version before release | |
| 18 | 18 | SET (CARES_VERSION "${PROJECT_VERSION}") | |
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w | |||
| 30 | 30 | # For example, a version of 4:0:2 would generate output such as: | |
| 31 | 31 | # libname.so -> libname.so.2 | |
| 32 | 32 | # libname.so.2 -> libname.so.2.2.0 | |
| 33 | - SET (CARES_LIB_VERSIONINFO "17:0:15") | ||
| 33 | + SET (CARES_LIB_VERSIONINFO "18:0:16") | ||
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | 36 | OPTION (CARES_STATIC "Build as a static library" OFF) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,3 @@ | |||
| 1 | - ** This file is adapted from libcurl and not yet fully rewritten for c-ares! ** | ||
| 2 | - | ||
| 3 | 1 | ``` | |
| 4 | 2 | ___ __ _ _ __ ___ ___ | |
| 5 | 3 | / __| ___ / _` | '__/ _ \/ __| | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -42,7 +42,7 @@ RD = rmdir /q /s 2>NUL | |||
| 42 | 42 | CP = copy | |
| 43 | 43 | ||
| 44 | 44 | CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -aa & | |
| 45 | - -wcd=201 -bt=nt -d+ -dWIN32 -dCARES_BUILDING_LIBRARY & | ||
| 45 | + -wcd=201 -bt=nt -d+ -dCARES_BUILDING_LIBRARY & | ||
| 46 | 46 | -dNTDDI_VERSION=0x06020000 -I. -I.\include -I.\src\lib $(SYS_INCL) | |
| 47 | 47 | ||
| 48 | 48 | LFLAGS = option quiet, map, caseexact, eliminate | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,11 +26,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat | |||
| 26 | 26 | ||
| 27 | 27 | # adig and ahost are just sample programs and thus not mentioned with the | |
| 28 | 28 | # regular sources and headers | |
| 29 | - EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \ | ||
| 30 | - c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \ | ||
| 31 | - maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \ | ||
| 29 | + EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md \ | ||
| 30 | + c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \ | ||
| 31 | + README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \ | ||
| 32 | 32 | CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \ | |
| 33 | - Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \ | ||
| 33 | + Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \ | ||
| 34 | 34 | cmake/EnableWarnings.cmake | |
| 35 | 35 | ||
| 36 | 36 | CLEANFILES = $(PDFPAGES) $(HTMLPAGES) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -230,8 +230,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcares.pc.in \ | |||
| 230 | 230 | $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ | |
| 231 | 231 | $(top_srcdir)/config/config.sub \ | |
| 232 | 232 | $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ | |
| 233 | - $(top_srcdir)/config/missing AUTHORS INSTALL.md NEWS README.md \ | ||
| 234 | - TODO config/compile config/config.guess config/config.sub \ | ||
| 233 | + $(top_srcdir)/config/missing AUTHORS INSTALL.md README.md \ | ||
| 234 | + config/compile config/config.guess config/config.sub \ | ||
| 235 | 235 | config/install-sh config/ltmain.sh config/missing | |
| 236 | 236 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| 237 | 237 | distdir = $(PACKAGE)-$(VERSION) | |
@@ -439,11 +439,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat | |||
| 439 | 439 | ||
| 440 | 440 | # adig and ahost are just sample programs and thus not mentioned with the | |
| 441 | 441 | # regular sources and headers | |
| 442 | - EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \ | ||
| 443 | - c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \ | ||
| 444 | - maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \ | ||
| 442 | + EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md \ | ||
| 443 | + c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \ | ||
| 444 | + README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \ | ||
| 445 | 445 | CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \ | |
| 446 | - Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \ | ||
| 446 | + Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \ | ||
| 447 | 447 | cmake/EnableWarnings.cmake | |
| 448 | 448 | ||
| 449 | 449 | CLEANFILES = $(PDFPAGES) $(HTMLPAGES) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -71,7 +71,9 @@ RTLIBD = /MTd | |||
| 71 | 71 | # otherwise Winsock tcp/ip stack will be used as default. | |
| 72 | 72 | # -------------------------------------------------------- | |
| 73 | 73 | ||
| 74 | + !IFNDEF USE_WATT32 | ||
| 74 | 75 | USE_WATT32 = 0 | |
| 76 | + !ENDIF | ||
| 75 | 77 | ||
| 76 | 78 | # -------------------------------------------------------- | |
| 77 | 79 | # Detect compiler version. | |
@@ -176,11 +178,14 @@ PROG3_OBJDIR = $(PROG3_OUTDIR)\obj | |||
| 176 | 178 | # ------------------------------------- | |
| 177 | 179 | ||
| 178 | 180 | !IF "$(USE_WATT32)" == "1" | |
| 179 | - CFLAGS = /UWIN32 /DWATT32 /I$(WATT_ROOT)\inc | ||
| 180 | - EX_LIBS_REL = $(WATT_ROOT)\lib\wattcpvc_imp.lib | ||
| 181 | - EX_LIBS_DBG = $(WATT_ROOT)\lib\wattcpvc_imp_d.lib | ||
| 181 | + CFLAGS = /D_WIN32_WINNT=0x0602 /DWATT32 /I$(WATT_ROOT)\inc | ||
| 182 | + ! IFNDEF PLATFORM | ||
| 183 | + PLATFORM = x86 | ||
| 184 | + ! ENDIF | ||
| 185 | + EX_LIBS_REL = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp.lib advapi32.lib | ||
| 186 | + EX_LIBS_DBG = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp_d.lib advapi32.lib | ||
| 182 | 187 | !ELSE | |
| 183 | - CFLAGS = /DWIN32 /D_WIN32_WINNT=0x0602 | ||
| 188 | + CFLAGS = /D_WIN32_WINNT=0x0602 | ||
| 184 | 189 | EX_LIBS_REL = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib | |
| 185 | 190 | EX_LIBS_DBG = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib | |
| 186 | 191 | !ENDIF | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | 3 | [](https://cirrus-ci.com/github/c-ares/c-ares) | |
| 4 | 4 | [](https://ci.appveyor.com/project/c-ares/c-ares/branch/main) | |
| 5 | - [](https://coveralls.io/github/c-ares/c-ares) | ||
| 5 | + [](https://coveralls.io/github/c-ares/c-ares?branch=main) | ||
| 6 | 6 | [](https://bestpractices.coreinfrastructure.org/projects/291) | |
| 7 | 7 | [](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares) | |
| 8 | 8 | [](https://sonarcloud.io/summary/new_code?id=c-ares_c-ares) | |
@@ -39,7 +39,7 @@ best practices in regards to C coding standards. | |||
| 39 | 39 | ||
| 40 | 40 | The full source code and revision history is available in our | |
| 41 | 41 | [GitHub repository](https://github.com/c-ares/c-ares). Our signed releases | |
| 42 | - are available in the ['c-ares' release archives](https://c-ares.org/download/). | ||
| 42 | + are available in the [release archives](https://c-ares.org/download/). | ||
| 43 | 43 | ||
| 44 | 44 | ||
| 45 | 45 | See the [INSTALL.md](INSTALL.md) file for build information. | |
| Back | FazBrowse Home | New Git URL |
0 commit comments