[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 37/150: build: fix windows build methods for curl_c
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 37/150: build: fix windows build methods for curl_ctype.c |
Date: |
Fri, 30 Mar 2018 16:48:11 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 2b50e56343e1ac805f10ca17935716b5c70c44b1
Author: Jay Satiro <address@hidden>
AuthorDate: Tue Jan 30 19:12:25 2018 -0500
build: fix windows build methods for curl_ctype.c
- Fix winbuild and the VS project generator to treat curl_ctype.{c,h} as
curlx files since they are required by both src and lib.
Follow-up to 4272a0b which added curl_ctype.
---
projects/generate.bat | 2 ++
winbuild/MakefileBuild.vc | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/projects/generate.bat b/projects/generate.bat
index f8fb81fe9..d1fc6088c 100644
--- a/projects/generate.bat
+++ b/projects/generate.bat
@@ -284,12 +284,14 @@ rem
call :element %1 lib "strtoofft.c" %3
call :element %1 lib "nonblock.c" %3
call :element %1 lib "warnless.c" %3
+ call :element %1 lib "curl_ctype.c" %3
) else if "!var!" == "CURL_SRC_X_H_FILES" (
call :element %1 lib "config-win32.h" %3
call :element %1 lib "curl_setup.h" %3
call :element %1 lib "strtoofft.h" %3
call :element %1 lib "nonblock.h" %3
call :element %1 lib "warnless.h" %3
+ call :element %1 lib "curl_ctype.h" %3
) else if "!var!" == "CURL_LIB_C_FILES" (
for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib
"%%c" %3
) else if "!var!" == "CURL_LIB_H_FILES" (
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index b6d29ce21..442888ce7 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -520,7 +520,8 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \
$(CURL_DIROBJ)\nonblock.obj \
$(CURL_DIROBJ)\strtoofft.obj \
- $(CURL_DIROBJ)\warnless.obj
+ $(CURL_DIROBJ)\warnless.obj \
+ $(CURL_DIROBJ)\curl_ctype.obj
$(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS)
$(CURL_FROM_LIBCURL) $(EXE_OBJS)
@@ -537,6 +538,8 @@ $(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c
$(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c
$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/warnless.c
+$(CURL_DIROBJ)\curl_ctype.obj: ../lib/curl_ctype.c
+ $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_ctype.c
$(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc
rc $(CURL_RC_FLAGS)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 28/150: time: support > year 2038 time stamps for system with 32bit long, (continued)
- [GNUnet-SVN] [gnurl] 28/150: time: support > year 2038 time stamps for system with 32bit long, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 49/150: build-wolfssl.bat: Extend VC15 support to include Enterprise and Professional, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 83/150: TODO: 1.1 Option to refuse usernames in URLs, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 57/150: content_encoding: Add "none" alias to "identity", gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 70/150: libcurl-security.3: the http://192.168.0.1/my_router_config case, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 106/150: TODO: remove "sha-256 digest", added in 2b5b37cb9109e7c2, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 85/150: CURLOPT_HEADERFUNCTION.3: fix typo from d939226813, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 73/150: BINDINGS: fix curb link (and remove ruby-curl-multi), gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 122/150: winbuild: prefer documented zlib library names, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 44/150: build: fix termios issue on android cross-compile, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 37/150: build: fix windows build methods for curl_ctype.c,
gnunet <=
- [GNUnet-SVN] [gnurl] 75/150: nss: use PK11_CreateManagedGenericObject() if available, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 58/150: schannel: fix "no previous prototype" compiler warning, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 56/150: build-openssl.bat: Follow up to 648679ab8e to suppress copy/move output, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 90/150: CURLOPT_HEADER.3: clarify problems with different data sizes, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 89/150: test1556: verify >16KB headers to the header callback, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 94/150: CURLOPT_RESOLVE: Add support for multiple IP addresses per entry, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 120/150: curl.1: mention how to add numerical IP addresses in NO_PROXY, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 35/150: http2: set DEBUG_HTTP2 to enable more HTTP/2 logging, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 65/150: tlsauthtype.d: works only if libcurl is built with TLS-SRP support, gnunet, 2018/03/30
- [GNUnet-SVN] [gnurl] 76/150: KNOWN_BUGS: 2.5 curl should not offer "ALPN: h2" when using https-proxy, gnunet, 2018/03/30