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.

diff --git a/projects/generate.bat b/projects/generate.bat
index f8fb81fe9a877e5a54298d7c9d923a7d85d8c02d..d1fc6088c6989094f0f8e5c0501ab6f4dbe83174 100644 (file)
--- 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 b6d29ce21c0997a4cd1d5c015e43ccd1f8c30d8f..442888ce758120039c41ffeba7edc28df8766dfc 100644 (file)
--- 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 \\r
  $(CURL_DIROBJ)\nonblock.obj \\r
  $(CURL_DIROBJ)\strtoofft.obj \\r
- $(CURL_DIROBJ)\warnless.obj\r
+ $(CURL_DIROBJ)\warnless.obj \\r
+ $(CURL_DIROBJ)\curl_ctype.obj\r
  \r
 $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)\r
        $(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)\r
@@ -537,6 +538,8 @@ $(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c\r
 $(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c\r
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/warnless.c\r
+$(CURL_DIROBJ)\curl_ctype.obj: ../lib/curl_ctype.c\r
+       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_ctype.c\r
 $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc\r
        rc $(CURL_RC_FLAGS)\r
 \r