Commit cc8fad9a authored by Yang Tse's avatar Yang Tse
Browse files

move msvc IDE related files to 'vs' directory tree 

Use 'vs' directory tree given that 'vc' intended one clashes
with an already existing build target in file Makefile.dist.
parent 72da89a7

Makefile.am

+13 −13
Original line number Diff line number Diff line
@@ -30,22 +30,22 @@ 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

VC6LIBDSP = vs/vc6/lib/vc6libcurl.dsp

VC6LIBDSPHEAD = vs/t/lib/vc6_libcurl_dsp.head

VC6LIBDSPFOOT = vs/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

VC8LIBPRJ = vs/vc8/lib/vc8libcurl.vcproj

VC8LIBPRJHEAD = vs/t/lib/vc8_libcurl_prj.head

VC8LIBPRJFOOT = vs/t/lib/vc8_libcurl_prj.foot



VC_DIST = \

 vc/t/README \

 vs/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

 vs/vc6/vc6curl.dsw \

 vs/vc6/lib/vc6libcurl.dsw \

 vs/vc6/src/vc6curltool.dsw \

 vs/vc6/src/vc6curltool.dsp



VC6LIBDSP_DEPS = $(VC6LIBDSPHEAD) $(VC6LIBDSPFOOT) \

 Makefile.am lib/Makefile.inc
@@ -206,7 +206,7 @@ vc6-ide: 
$(VC6LIBDSP): $(VC6LIBDSP_DEPS)

	@(echo "generating '$(VC6LIBDSP)'"; \

	\

	for dir in 'vc' 'vc/vc6' 'vc/vc6/lib'; do \

	for dir in 'vs' 'vs/vc6' 'vs/vc6/lib'; do \

	  test -d "$$dir" || mkdir "$$dir" || exit 1; \

	done; \

	\
@@ -252,7 +252,7 @@ vc8-ide: 
$(VC8LIBPRJ): $(VC8LIBPRJ_DEPS)

	@(echo "generating '$(VC8LIBPRJ)'"; \

	\

	for dir in 'vc' 'vc/vc8' 'vc/vc8/lib'; do \

	for dir in 'vs' 'vs/vc8' 'vs/vc8/lib'; do \

	  test -d "$$dir" || mkdir "$$dir" || exit 1; \

	done; \

	\

docs/INSTALL

+4 −4
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ Win32 
   source distribution archive to allow proper building of the two included

   projects, the libcurl library and the curl tool.



   1) Open the vc6curl.dsw workspace with MSVC6's IDE.

   1) Open the vs/vc6/vc6curl.dsw workspace with MSVC6's IDE.

   2) Select 'Build' from top menu.

   3) Select 'Batch Build' from dropdown menu.

   4) Make sure that the eight project configurations are 'checked'.
@@ -367,12 +367,12 @@ Win32 
   6) Once the eight project configurations are built you are done.



   Dynamic and static libcurl libraries are built in debug and release flavours,

   and can be located each one in its own subdirectory, DLL-Debug, DLL-Release,

   LIB-Debug and LIB-Release, all of them below the 'lib' subdirectory.

   and can be located each one in its own subdirectory, dll-debug, dll-release,

   lib-debug and lib-release, all of them below the 'vs/vc6/lib' subdirectory.



   In the same way four curl executables are created, each using its respective

   library. The resulting curl executables are located in its own subdirectory,

   DLL-Debug, DLL-Release, LIB-Debug and LIB-Release, below the 'src' subdir.

   dll-debug, dll-release, lib-debug and lib-release, below 'vs/vc6/src' subdir.



   These reference VC++ 6.0 configurations are generated using the dynamic CRT.

vc/.gitignore→vs/.gitignore

+0 −0

File moved.

View file

vc/t/.gitattributes→vs/t/.gitattributes

+0 −0

File moved.

View file

vc/t/.gitignore→vs/t/.gitignore

+0 −0

File moved.

View file