[GNUnet-SVN] [gnurl] 37/150: build: fix windows build methods for curl_ctype.c

[gnunet]

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