move msvc IDE related files to 'vc' directory tree

16 files changed, 789 insertions, 737 deletions

diff --git a/Makefile.am b/Makefile.am
index edbc805dd..6c582c772 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,13 +30,38 @@ CMake/CurlTests.c CMake/FindOpenSSL.cmake CMake/FindZLIB.cmake		\
 CMake/OtherTests.cmake CMake/Platforms/WindowsCache.cmake		\
 CMake/Utilities.cmake include/curl/curlbuild.h.cmake
 
+VC6LIBDSP = vc/vc6/lib/vc6libcurl.dsp
+VC6LIBDSPHEAD = vc/t/lib/vc6_libcurl_dsp.head
+VC6LIBDSPFOOT = vc/t/lib/vc6_libcurl_dsp.foot
+
+VC8LIBPRJ = vc/vc8/lib/vc8libcurl.vcproj
+VC8LIBPRJHEAD = vc/t/lib/vc8_libcurl_prj.head
+VC8LIBPRJFOOT = vc/t/lib/vc8_libcurl_prj.foot
+
+VC_DIST = \
+ vc/t/README \
+ $(VC6LIBDSP) $(VC6LIBDSPHEAD) $(VC6LIBDSPFOOT) \
+ $(VC8LIBPRJ) $(VC8LIBPRJHEAD) $(VC8LIBPRJFOOT) \
+ vc/vc6/vc6curl.dsw \
+ vc/vc6/lib/vc6libcurl.dsw \
+ vc/vc6/src/vc6curltool.dsw \
+ vc/vc6/src/vc6curltool.dsp
+
+VC6LIBDSP_DEPS = $(VC6LIBDSPHEAD) $(VC6LIBDSPFOOT) \
+ Makefile.am lib/Makefile.inc
+
+VC8LIBPRJ_DEPS = $(VC8LIBPRJHEAD) $(VC8LIBPRJFOOT) \
+ Makefile.am lib/Makefile.inc
+
 WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat	\
  winbuild/MakefileBuild.vc winbuild/Makefile.vc				\
  winbuild/Makefile.msvc.names
 
 EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in	\
- RELEASE-NOTES buildconf libcurl.pc.in vc6curl.dsw MacOSX-Framework	\
- $(CMAKE_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in
+ RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework	\
+ $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) lib/libcurl.vers.in
+
+CLEANFILES = $(VC6LIBDSP) $(VC8LIBPRJ)
 
 bin_SCRIPTS = curl-config
 
@@ -46,6 +71,12 @@ DIST_SUBDIRS = $(SUBDIRS) tests packages docs
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcurl.pc
 
+# List of libcurl source files required to generate VC IDE dsp and prj files
+include lib/Makefile.inc
+
+WIN32SOURCES = $(CSOURCES)
+WIN32HEADERS = $(HHEADERS) config-win32.h
+
 dist-hook:
 	rm -rf $(top_builddir)/tests/log
 	find $(distdir) -name "*.dist" -exec rm {} \;
@@ -89,7 +120,7 @@ endif
 examples:
 	@(cd docs/examples; $(MAKE) check)
 
-# This is a hook to have 'make clean' also clean up the dosc and the tests
+# This is a hook to have 'make clean' also clean up the docs and the tests
 # dir. The extra check for the Makefiles being present is necessary because
 # 'make distcheck' will make clean first in these directories _before_ it runs
 # this hook.
@@ -166,3 +197,86 @@ ca-firefox: lib/firefox-db2pem.sh
 checksrc:
 	cd lib && $(MAKE) checksrc
 	cd src && $(MAKE) checksrc
+
+.PHONY: vc6-ide
+
+vc6-ide:
+	$(MAKE) $(VC6LIBDSP)
+
+$(VC6LIBDSP): $(VC6LIBDSP_DEPS)
+	@(echo "generating '$(VC6LIBDSP)'"; \
+	\
+	for dir in 'vc' 'vc/vc6' 'vc/vc6/lib'; do \
+	  test -d "$$dir" || mkdir "$$dir" || exit 1; \
+	done; \
+	\
+	dir='..\..\..\lib\'; \
+	body='$(VC6LIBDSP)'.body; \
+	win32_srcs='$(WIN32SOURCES)'; \
+	win32_hdrs='$(WIN32HEADERS)'; \
+	sorted_srcs=`for file in $$win32_srcs; do echo $$file; done | sort`; \
+	sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done | sort`; \
+	\
+	echo "# Begin Group \"Source Files\""  > $$body; \
+	echo ""                               >> $$body; \
+	echo "# PROP Default_Filter \"\""     >> $$body; \
+	for file in $$sorted_srcs; do \
+	  echo "# Begin Source File"          >> $$body; \
+	  echo ""                             >> $$body; \
+	  echo "SOURCE="$$dir$$file           >> $$body; \
+	  echo "# End Source File"            >> $$body; \
+	done; \
+	echo "# End Group"                    >> $$body; \
+	echo "# Begin Group \"Header Files\"" >> $$body; \
+	echo ""                               >> $$body; \
+	echo "# PROP Default_Filter \"\""     >> $$body; \
+	for file in $$sorted_hdrs; do \
+	  echo "# Begin Source File"          >> $$body; \
+	  echo ""                             >> $$body; \
+	  echo "SOURCE="$$dir$$file           >> $$body; \
+	  echo "# End Source File"            >> $$body; \
+	done; \
+	echo "# End Group"                    >> $$body; \
+	\
+	awk '{ printf("%s\r\n", $$0); }' \
+	  $(srcdir)/$(VC6LIBDSPHEAD) $$body $(srcdir)/$(VC6LIBDSPFOOT) \
+	  > $(VC6LIBDSP) || { rm -f $$body; exit 1; }; \
+	\
+	rm -f $$body)
+
+.PHONY: vc8-ide
+
+vc8-ide:
+	$(MAKE) $(VC8LIBPRJ)
+
+$(VC8LIBPRJ): $(VC8LIBPRJ_DEPS)
+	@(echo "generating '$(VC8LIBPRJ)'"; \
+	\
+	for dir in 'vc' 'vc/vc8' 'vc/vc8/lib'; do \
+	  test -d "$$dir" || mkdir "$$dir" || exit 1; \
+	done; \
+	\
+	dir='..\..\..\lib\'; \
+	body='$(VC8LIBPRJ)'.body; \
+	win32_srcs='$(WIN32SOURCES)'; \
+	win32_hdrs='$(WIN32HEADERS)'; \
+	sorted_srcs=`for file in $$win32_srcs; do echo $$file; done | sort`; \
+	sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done | sort`; \
+	\
+	echo "%tab%%tab%<Filter Name=\"Source Files\">"  > $$body; \
+	for file in $$sorted_srcs; do \
+	  echo "%tab%%tab%%tab%<File RelativePath=\""$$dir$$file"\"></File>" >> $$body; \
+	done; \
+	echo "%tab%%tab%</Filter>"                      >> $$body; \
+	echo "%tab%%tab%<Filter Name=\"Header Files\">" >> $$body; \
+	for file in $$sorted_hdrs; do \
+	  echo "%tab%%tab%%tab%<File RelativePath=\""$$dir$$file"\"></File>" >> $$body; \
+	done; \
+	echo "%tab%%tab%</Filter>"                      >> $$body; \
+	\
+	awk '{ gsub(/%tab%/, "\t"); printf("%s\r\n", $$0); }' \
+	  $(srcdir)/$(VC8LIBPRJHEAD) $$body $(srcdir)/$(VC8LIBPRJFOOT) \
+	  > $(VC8LIBPRJ) || { rm -f $$body; exit 1; }; \
+	\
+	rm -f $$body)
+
diff --git a/lib/.gitignore b/lib/.gitignore
index a88bc9281..e289640c6 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -7,8 +7,6 @@ TAGS
 Makefile.vc8.dist
 Makefile.vc9.dist
 libcurl.plist.dist
-libcurl.vcproj
-vc6libcurl.dsp
 Makefile.vc10.dist
 libcurl.vers
 *.a
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 23f8661f5..f777df1cd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,27 +21,21 @@
 ###########################################################################
 AUTOMAKE_OPTIONS = foreign nostdinc
 
-DSP = vc6libcurl.dsp
-VCPROJ = libcurl.vcproj
-
 DOCS = README.encoding README.memoryleak README.ares README.curlx	\
  README.hostip README.multi_socket README.httpauth README.pipelining    \
  README.curl_off_t README.pingpong
 
 CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 
-EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP)		\
- vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h		\
- config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist	\
- libcurl.rc config-amigaos.h makefile.amiga Makefile.netware nwlib.c	\
- nwos.c msvcproj.head msvcproj.foot config-win32ce.h config-os400.h	\
- setup-os400.h config-symbian.h Makefile.Watcom config-tpf.h $(DOCS)	\
- $(VCPROJ) mk-ca-bundle.pl mk-ca-bundle.vbs firefox-db2pem.sh		\
- $(CMAKE_DIST) config-vxworks.h Makefile.vxworks checksrc.pl		\
+EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 config-win32.h	\
+ config-win32ce.h config-riscos.h config-mac.h curl_config.h.in		\
+ makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h	\
+ makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h	\
+ config-os400.h setup-os400.h config-symbian.h Makefile.Watcom		\
+ config-tpf.h $(DOCS) mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST)	\
+ firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl	\
  objnames-test08.sh objnames-test10.sh objnames.inc
 
-CLEANFILES = $(DSP) $(VCPROJ)
-
 lib_LTLIBRARIES = libcurl.la
 LIBCURL_LIBS = @LIBCURL_LIBS@
 
@@ -162,58 +156,6 @@ include Makefile.inc
 libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
 libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS)
 
-WIN32SOURCES = $(CSOURCES)
-WIN32HEADERS = $(HHEADERS) config-win32.h
-
-DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)
-VCPROJOUT = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ)
-
-$(DSP): msvcproj.head msvcproj.foot Makefile.am
-	echo "creating $(DSP)"
-	@(cp $(srcdir)/msvcproj.head $(DSP); \
-	echo "# Begin Group \"Source Files\"" $(DSPOUT); \
-        echo "" $(DSPOUT); \
-        echo "# PROP Default_Filter \"\"" $(DSPOUT); \
-        win32_srcs='$(WIN32SOURCES)'; \
-        sorted_srcs=`for file in $$win32_srcs; do echo $$file; done | sort`; \
-        for file in $$sorted_srcs; do \
-	echo "# Begin Source File" $(DSPOUT); \
-	echo "" $(DSPOUT); \
-	echo "SOURCE=.\\"$$file $(DSPOUT); \
-	echo "# End Source File" $(DSPOUT); \
-	done; \
-	echo "# End Group" $(DSPOUT); \
-	echo "# Begin Group \"Header Files\"" $(DSPOUT); \
-        echo "" $(DSPOUT); \
-        echo "# PROP Default_Filter \"\"" $(DSPOUT); \
-        win32_hdrs='$(WIN32HEADERS)'; \
-        sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done | sort`; \
-        for file in $$sorted_hdrs; do \
-	echo "# Begin Source File" $(DSPOUT); \
-	echo "" $(DSPOUT); \
-	echo "SOURCE=.\\"$$file $(DSPOUT); \
-	echo "# End Source File" $(DSPOUT); \
-	done; \
-	echo "# End Group" $(DSPOUT); \
-	cat $(srcdir)/msvcproj.foot $(DSPOUT) )
-
-$(VCPROJ): vc8proj.head vc8proj.foot Makefile.am
-	echo "creating $(VCPROJ)"
-	@(cp $(srcdir)/vc8proj.head $(VCPROJ); \
-        win32_srcs='$(WIN32SOURCES)'; \
-        sorted_srcs=`for file in $$win32_srcs; do echo $$file; done | sort`; \
-        for file in $$sorted_srcs; do \
-	echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \
-	done; \
-	echo "</Filter><Filter	Name=\"Header Files\">" $(VCPROJOUT); \
-        win32_hdrs='$(WIN32HEADERS)'; \
-        sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done | sort`; \
-        for file in $$sorted_hdrs; do \
-	echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \
-	done; \
-	cat $(srcdir)/vc8proj.foot $(VCPROJOUT) )
-
-
 checksrc:
 	@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/lib $(CSOURCES) $(HHEADERS)
 
diff --git a/lib/msvcproj.head b/lib/msvcproj.head
deleted file mode 100644
index 59e539dfa..000000000
--- a/lib/msvcproj.head
+++ /dev/null
@@ -1,147 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libcurl" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=libcurl - Win32 LIB Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libcurl.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libcurl.mak" CFG="libcurl - Win32 LIB Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libcurl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libcurl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libcurl - Win32 LIB Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "libcurl - Win32 LIB Release" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "libcurl - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "DLL-Debug"

-# PROP BASE Intermediate_Dir "DLL-Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "DLL-Debug"

-# PROP Intermediate_Dir "DLL-Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /GZ /c

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"DLL-Debug/libcurld.dll" /implib:"DLL-Debug/libcurld_imp.lib" /pdbtype:sept

-# ADD LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"DLL-Debug/libcurld.dll" /implib:"DLL-Debug/libcurld_imp.lib" /pdbtype:sept

-

-!ELSEIF  "$(CFG)" == "libcurl - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "DLL-Release"

-# PROP BASE Intermediate_Dir "DLL-Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "DLL-Release"

-# PROP Intermediate_Dir "DLL-Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /c

-MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /pdb:none /machine:I386 /out:"DLL-Release/libcurl.dll" /implib:"DLL-Release/libcurl_imp.lib"

-# ADD LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /pdb:none /machine:I386 /out:"DLL-Release/libcurl.dll" /implib:"DLL-Release/libcurl_imp.lib"

-

-!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "LIB-Debug"

-# PROP BASE Intermediate_Dir "LIB-Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "LIB-Debug"

-# PROP Intermediate_Dir "LIB-Debug"

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /GZ /c

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"LIB-Debug/libcurld.lib" /machine:I386

-# ADD LIB32 /nologo /out:"LIB-Debug/libcurld.lib" /machine:I386

-

-!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "LIB-Release"

-# PROP BASE Intermediate_Dir "LIB-Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "LIB-Release"

-# PROP Intermediate_Dir "LIB-Release"

-# PROP Target_Dir ""

-CPP=cl.exe

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /c

-RSC=rc.exe

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"LIB-Release/libcurl.lib" /machine:I386

-# ADD LIB32 /nologo /out:"LIB-Release/libcurl.lib" /machine:I386

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libcurl - Win32 DLL Debug"

-# Name "libcurl - Win32 DLL Release"

-# Name "libcurl - Win32 LIB Debug"

-# Name "libcurl - Win32 LIB Release"

diff --git a/lib/vc8proj.foot b/lib/vc8proj.foot
deleted file mode 100644
index ac861b02c..000000000
--- a/lib/vc8proj.foot
+++ /dev/null
@@ -1,11 +0,0 @@
-
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/Makefile.am b/src/Makefile.am
index af5a48800..081820558 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,10 +75,9 @@ NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
 
 EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
 	macos/curl.mcp.xml.sit.hqx                                        \
-	macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \
+	macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp \
 	macos/src/macos_main.cpp makefile.amiga curl.rc                   \
-	Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw      \
-	CMakeLists.txt
+	Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt
 
 MANPAGE=$(top_srcdir)/docs/curl.1
 README=$(top_srcdir)/docs/MANUAL
diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp
deleted file mode 100644
index 5fb7fe1d1..000000000
--- a/src/vc6curlsrc.dsp
+++ /dev/null
@@ -1,498 +0,0 @@
-# Microsoft Developer Studio Project File - Name="curlsrc" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=curlsrc - Win32 using libcurl LIB Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "curlsrc.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "curlsrc.mak" CFG="curlsrc - Win32 using libcurl LIB Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "curlsrc - Win32 using libcurl DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "curlsrc - Win32 using libcurl DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "curlsrc - Win32 using libcurl LIB Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "curlsrc - Win32 using libcurl LIB Release" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "curlsrc - Win32 using libcurl DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "DLL-Debug"

-# PROP BASE Intermediate_Dir "DLL-Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "DLL-Debug"

-# PROP Intermediate_Dir "DLL-Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" /FD /GZ /c

-# ADD BASE RSC /l 0x409 /i "..\include" /d "_DEBUG"

-# ADD RSC /l 0x409 /i "..\include" /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 libcurld_imp.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"DLL-Debug/curl.exe" /pdbtype:sept /libpath:"..\lib\DLL-Debug"

-# ADD LINK32 libcurld_imp.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"DLL-Debug/curl.exe" /pdbtype:sept /libpath:"..\lib\DLL-Debug"

-

-!ELSEIF  "$(CFG)" == "curlsrc - Win32 using libcurl DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "DLL-Release"

-# PROP BASE Intermediate_Dir "DLL-Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "DLL-Release"

-# PROP Intermediate_Dir "DLL-Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_CONSOLE" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_CONSOLE" /FD /c

-# ADD BASE RSC /l 0x409 /i "..\include" /d "NDEBUG"

-# ADD RSC /l 0x409 /i "..\include" /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 libcurl_imp.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"DLL-Release/curl.exe" /libpath:"..\lib\DLL-Release"

-# ADD LINK32 libcurl_imp.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"DLL-Release/curl.exe" /libpath:"..\lib\DLL-Release"

-

-!ELSEIF  "$(CFG)" == "curlsrc - Win32 using libcurl LIB Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "LIB-Debug"

-# PROP BASE Intermediate_Dir "LIB-Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "LIB-Debug"

-# PROP Intermediate_Dir "LIB-Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" /D "CURL_STATICLIB" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" /D "CURL_STATICLIB" /FD /GZ /c

-# ADD BASE RSC /l 0x409 /i "..\include" /d "_DEBUG"

-# ADD RSC /l 0x409 /i "..\include" /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 libcurld.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"LIB-Debug/curl.exe" /pdbtype:sept /libpath:"..\lib\LIB-Debug"

-# ADD LINK32 libcurld.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"LIB-Debug/curl.exe" /pdbtype:sept /libpath:"..\lib\LIB-Debug"

-

-!ELSEIF  "$(CFG)" == "curlsrc - Win32 using libcurl LIB Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "LIB-Release"

-# PROP BASE Intermediate_Dir "LIB-Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "LIB-Release"

-# PROP Intermediate_Dir "LIB-Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_CONSOLE" /D "CURL_STATICLIB" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\lib" /I "..\include" /I "." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_CONSOLE" /D "CURL_STATICLIB" /FD /c

-# ADD BASE RSC /l 0x409 /i "..\include" /d "NDEBUG"

-# ADD RSC /l 0x409 /i "..\include" /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 libcurl.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"LIB-Release/curl.exe" /libpath:"..\lib\LIB-Release"

-# ADD LINK32 libcurl.lib kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"LIB-Release/curl.exe" /libpath:"..\lib\LIB-Release"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "curlsrc - Win32 using libcurl DLL Debug"

-# Name "curlsrc - Win32 using libcurl DLL Release"

-# Name "curlsrc - Win32 using libcurl LIB Debug"

-# Name "curlsrc - Win32 using libcurl LIB Release"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\lib\nonblock.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\rawstr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\strtoofft.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_binmode.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_bname.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_dbg.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_hdr.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_prg.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_rea.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_see.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_wrt.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cfgable.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_convert.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_dirhie.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_doswin.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_easysrc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_formparse.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_getparam.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_getpass.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_help.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_helpers.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_homedir.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_hugehelp.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_libinfo.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_main.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_metalink.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_mfiles.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_msgs.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_operate.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_operhlp.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_panykey.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_paramhlp.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_parsecfg.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_setopt.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_sleep.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_urlglob.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_util.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_vms.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_writeenv.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_writeout.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_xattr.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=".\config-win32.h"

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\nonblock.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\rawstr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\lib\strtoofft.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_binmode.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_bname.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_dbg.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_hdr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_prg.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_rea.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_see.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cb_wrt.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_cfgable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_convert.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_dirhie.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_doswin.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_easysrc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_formparse.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_getparam.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_getpass.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_help.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_helpers.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_homedir.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_hugehelp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_libinfo.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_main.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_metalink.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_mfiles.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_msgs.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_operate.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_operhlp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_panykey.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_paramhlp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_parsecfg.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_sdecls.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_setopt.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_setup.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_sleep.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_urlglob.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_util.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_version.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_vms.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_writeenv.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_writeout.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\tool_xattr.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\curl.rc

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/vc/t/README b/vc/t/README
new file mode 100644
index 000000000..75b04782c
--- /dev/null
+++ b/vc/t/README
@@ -0,0 +1,8 @@
+Note:

+

+Files located in subdirectory 'vc/t' and below are 'templates' used for

+the generation of msvc IDE workspace and project files, distributed in

+subdirectories 'vc/vc6' and 'vc/vc8'.

+

+All these template files use UNIX line endings intentionally, in order

+to allow proper file generation. Don't convert these to crlf line-ends.

diff --git a/lib/msvcproj.foot b/vc/t/lib/vc6_libcurl_dsp.foot
index 8ce4ca0af..fd10e8e49 100644
--- a/lib/msvcproj.foot
+++ b/vc/t/lib/vc6_libcurl_dsp.foot
@@ -1,10 +1,9 @@
-
 # Begin Group "Resource Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\libcurl.rc
+SOURCE=..\..\..\lib\libcurl.rc
 # End Source File
 # End Group
 # End Target
diff --git a/vc/t/lib/vc6_libcurl_dsp.head b/vc/t/lib/vc6_libcurl_dsp.head
new file mode 100644
index 000000000..06fb88dee
--- /dev/null
+++ b/vc/t/lib/vc6_libcurl_dsp.head
@@ -0,0 +1,147 @@
+# Microsoft Developer Studio Project File - Name="libcurl" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libcurl - Win32 LIB Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "vc6libcurl.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "vc6libcurl.mak" CFG="libcurl - Win32 LIB Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libcurl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libcurl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libcurl - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "libcurl - Win32 LIB Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "libcurl - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "dll-debug"
+# PROP BASE Intermediate_Dir "dll-debug/obj"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "dll-debug"
+# PROP Intermediate_Dir "dll-debug/obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "BUILDING_LIBCURL" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "BUILDING_LIBCURL" /FD /GZ /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"dll-debug/libcurld.dll" /implib:"dll-debug/libcurld_imp.lib" /pdbtype:con /fixed:no
+# ADD LINK32 wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"dll-debug/libcurld.dll" /implib:"dll-debug/libcurld_imp.lib" /pdbtype:con /fixed:no
+
+!ELSEIF  "$(CFG)" == "libcurl - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "dll-release"
+# PROP BASE Intermediate_Dir "dll-release/obj"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "dll-release"
+# PROP Intermediate_Dir "dll-release/obj"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "BUILDING_LIBCURL" /FD /c
+# ADD CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "BUILDING_LIBCURL" /FD /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /win32
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /dll /pdb:none /machine:I386 /out:"dll-release/libcurl.dll" /implib:"dll-release/libcurl_imp.lib" /fixed:no /release /incremental:no
+# ADD LINK32 wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /dll /pdb:none /machine:I386 /out:"dll-release/libcurl.dll" /implib:"dll-release/libcurl_imp.lib" /fixed:no /release /incremental:no
+
+!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "lib-debug"
+# PROP BASE Intermediate_Dir "lib-debug/obj"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "lib-debug"
+# PROP Intermediate_Dir "lib-debug/obj"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /GZ /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"lib-debug/libcurld.lib" /machine:I386
+# ADD LIB32 /nologo /out:"lib-debug/libcurld.lib" /machine:I386
+
+!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "lib-release"
+# PROP BASE Intermediate_Dir "lib-release/obj"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "lib-release"
+# PROP Intermediate_Dir "lib-release/obj"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /c
+# ADD CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"lib-release/libcurl.lib" /machine:I386
+# ADD LIB32 /nologo /out:"lib-release/libcurl.lib" /machine:I386
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libcurl - Win32 DLL Debug"
+# Name "libcurl - Win32 DLL Release"
+# Name "libcurl - Win32 LIB Debug"
+# Name "libcurl - Win32 LIB Release"
diff --git a/vc/t/lib/vc8_libcurl_prj.foot b/vc/t/lib/vc8_libcurl_prj.foot
new file mode 100644
index 000000000..862ef4227
--- /dev/null
+++ b/vc/t/lib/vc8_libcurl_prj.foot
@@ -0,0 +1,7 @@
+		<Filter Name="Resource Files">
+			<File RelativePath="..\..\..\lib\libcurl.rc"></File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib/vc8proj.head b/vc/t/lib/vc8_libcurl_prj.head
index 13326fa83..761468892 100644
--- a/lib/vc8proj.head
+++ b/vc/t/lib/vc8_libcurl_prj.head
@@ -99,7 +99,3 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Source Files"
-			>
-
diff --git a/lib/vc6libcurl.dsw b/vc/vc6/lib/vc6libcurl.dsw
index 1fa8814a6..1fa8814a6 100644
--- a/lib/vc6libcurl.dsw
+++ b/vc/vc6/lib/vc6libcurl.dsw
diff --git a/vc/vc6/src/vc6curltool.dsp b/vc/vc6/src/vc6curltool.dsp
new file mode 100644
index 000000000..131b71649
--- /dev/null
+++ b/vc/vc6/src/vc6curltool.dsp
@@ -0,0 +1,498 @@
+# Microsoft Developer Studio Project File - Name="curltool" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=curltool - Win32 using libcurl LIB Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "vc6curltool.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "vc6curltool.mak" CFG="curltool - Win32 using libcurl LIB Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "curltool - Win32 using libcurl DLL Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "curltool - Win32 using libcurl DLL Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "curltool - Win32 using libcurl LIB Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "curltool - Win32 using libcurl LIB Release" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "curltool - Win32 using libcurl DLL Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "dll-debug"

+# PROP BASE Intermediate_Dir "dll-debug/obj"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "dll-debug"

+# PROP Intermediate_Dir "dll-debug/obj"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /FD /GZ /c

+# ADD BASE RSC /l 0x409 /i "..\..\..\include" /d "_DEBUG"

+# ADD RSC /l 0x409 /i "..\..\..\include" /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libcurld_imp.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"dll-debug/curl.exe" /pdbtype:con /libpath:"..\lib\dll-debug" /fixed:no

+# ADD LINK32 libcurld_imp.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"dll-debug/curl.exe" /pdbtype:con /libpath:"..\lib\dll-debug" /fixed:no

+

+!ELSEIF  "$(CFG)" == "curltool - Win32 using libcurl DLL Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "dll-release"

+# PROP BASE Intermediate_Dir "dll-release/obj"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "dll-release"

+# PROP Intermediate_Dir "dll-release/obj"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /FD /c

+# ADD CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /FD /c

+# ADD BASE RSC /l 0x409 /i "..\..\..\include" /d "NDEBUG"

+# ADD RSC /l 0x409 /i "..\..\..\include" /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libcurl_imp.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"dll-release/curl.exe" /libpath:"..\lib\dll-release" /fixed:no

+# ADD LINK32 libcurl_imp.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"dll-release/curl.exe" /libpath:"..\lib\dll-release" /fixed:no

+

+!ELSEIF  "$(CFG)" == "curltool - Win32 using libcurl LIB Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "lib-debug"

+# PROP BASE Intermediate_Dir "lib-debug/obj"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "lib-debug"

+# PROP Intermediate_Dir "lib-debug/obj"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "CURL_STATICLIB" /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "CURL_STATICLIB" /FD /GZ /c

+# ADD BASE RSC /l 0x409 /i "..\..\..\include" /d "_DEBUG"

+# ADD RSC /l 0x409 /i "..\..\..\include" /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libcurld.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"lib-debug/curl.exe" /pdbtype:con /libpath:"..\lib\lib-debug" /fixed:no

+# ADD LINK32 libcurld.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"lib-debug/curl.exe" /pdbtype:con /libpath:"..\lib\lib-debug" /fixed:no

+

+!ELSEIF  "$(CFG)" == "curltool - Win32 using libcurl LIB Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "lib-release"

+# PROP BASE Intermediate_Dir "lib-release/obj"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "lib-release"

+# PROP Intermediate_Dir "lib-release/obj"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "CURL_STATICLIB" /FD /c

+# ADD CPP /nologo /MD /W3 /EHsc /O2 /I "..\..\..\lib" /I "..\..\..\include" /I "..\..\..\src" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "CURL_STATICLIB" /FD /c

+# ADD BASE RSC /l 0x409 /i "..\..\..\include" /d "NDEBUG"

+# ADD RSC /l 0x409 /i "..\..\..\include" /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libcurl.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"lib-release/curl.exe" /libpath:"..\lib\lib-release" /fixed:no

+# ADD LINK32 libcurl.lib wldap32.lib ws2_32.lib advapi32.lib kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"lib-release/curl.exe" /libpath:"..\lib\lib-release" /fixed:no

+

+!ENDIF 

+

+# Begin Target

+

+# Name "curltool - Win32 using libcurl DLL Debug"

+# Name "curltool - Win32 using libcurl DLL Release"

+# Name "curltool - Win32 using libcurl LIB Debug"

+# Name "curltool - Win32 using libcurl LIB Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\..\..\lib\nonblock.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\lib\rawstr.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\lib\strtoofft.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_binmode.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_bname.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_dbg.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_hdr.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_prg.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_rea.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_see.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_wrt.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cfgable.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_convert.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_dirhie.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_doswin.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_easysrc.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_formparse.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_getparam.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_getpass.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_help.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_helpers.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_homedir.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_hugehelp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_libinfo.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_main.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_metalink.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_mfiles.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_msgs.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_operate.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_operhlp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_panykey.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_paramhlp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_parsecfg.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_setopt.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_sleep.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_urlglob.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_util.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_vms.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_writeenv.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_writeout.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_xattr.c

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE="..\..\..\lib\config-win32.h"

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\lib\nonblock.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\lib\rawstr.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\lib\strtoofft.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_binmode.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_bname.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_dbg.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_hdr.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_prg.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_rea.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_see.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cb_wrt.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_cfgable.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_convert.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_dirhie.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_doswin.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_easysrc.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_formparse.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_getparam.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_getpass.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_help.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_helpers.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_homedir.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_hugehelp.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_libinfo.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_main.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_metalink.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_mfiles.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_msgs.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_operate.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_operhlp.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_panykey.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_paramhlp.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_parsecfg.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_sdecls.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_setopt.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_setup.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_sleep.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_urlglob.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_util.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_version.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_vms.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_writeenv.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_writeout.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\src\tool_xattr.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\..\..\src\curl.rc

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/src/vc6curlsrc.dsw b/vc/vc6/src/vc6curltool.dsw
index 6b2db6fba..b92638a89 100644
--- a/src/vc6curlsrc.dsw
+++ b/vc/vc6/src/vc6curltool.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "curlsrc"=".\vc6curlsrc.dsp" - Package Owner=<4>

+Project: "curltool"=".\vc6curltool.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/vc6curl.dsw b/vc/vc6/vc6curl.dsw
index 499bc107e..859edd5e1 100644
--- a/vc6curl.dsw
+++ b/vc/vc6/vc6curl.dsw
@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "curlsrc"=".\src\vc6curlsrc.dsp" - Package Owner=<4>

+Project: "curltool"=".\src\vc6curltool.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{