diff options
-rw-r--r-- | Makefile.am | 26 | ||||
-rw-r--r-- | docs/INSTALL | 8 | ||||
-rw-r--r-- | vs/.gitignore (renamed from vc/.gitignore) | 0 | ||||
-rw-r--r-- | vs/t/.gitattributes (renamed from vc/t/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/t/.gitignore (renamed from vc/t/.gitignore) | 0 | ||||
-rw-r--r-- | vs/t/README (renamed from vc/t/README) | 4 | ||||
-rw-r--r-- | vs/t/lib/.gitattributes (renamed from vc/t/lib/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/t/lib/.gitignore (renamed from vc/t/lib/.gitignore) | 0 | ||||
-rw-r--r-- | vs/t/lib/vc6_libcurl_dsp.foot (renamed from vc/t/lib/vc6_libcurl_dsp.foot) | 0 | ||||
-rw-r--r-- | vs/t/lib/vc6_libcurl_dsp.head (renamed from vc/t/lib/vc6_libcurl_dsp.head) | 0 | ||||
-rw-r--r-- | vs/t/lib/vc8_libcurl_prj.foot (renamed from vc/t/lib/vc8_libcurl_prj.foot) | 0 | ||||
-rw-r--r-- | vs/t/lib/vc8_libcurl_prj.head (renamed from vc/t/lib/vc8_libcurl_prj.head) | 0 | ||||
-rw-r--r-- | vs/t/src/.gitattributes (renamed from vc/t/src/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/t/src/.gitignore (renamed from vc/t/src/.gitignore) | 0 | ||||
-rw-r--r-- | vs/vc6/.gitattributes (renamed from vc/vc6/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/vc6/.gitignore (renamed from vc/vc6/.gitignore) | 0 | ||||
-rw-r--r-- | vs/vc6/lib/.gitattributes (renamed from vc/vc6/lib/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/vc6/lib/.gitignore (renamed from vc/vc6/lib/.gitignore) | 0 | ||||
-rw-r--r-- | vs/vc6/lib/vc6libcurl.dsw (renamed from vc/vc6/lib/vc6libcurl.dsw) | 0 | ||||
-rw-r--r-- | vs/vc6/src/.gitattributes (renamed from vc/vc6/src/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/vc6/src/.gitignore (renamed from vc/vc6/src/.gitignore) | 0 | ||||
-rw-r--r-- | vs/vc6/src/vc6curltool.dsp (renamed from vc/vc6/src/vc6curltool.dsp) | 0 | ||||
-rw-r--r-- | vs/vc6/src/vc6curltool.dsw (renamed from vc/vc6/src/vc6curltool.dsw) | 0 | ||||
-rw-r--r-- | vs/vc6/vc6curl.dsw (renamed from vc/vc6/vc6curl.dsw) | 0 | ||||
-rw-r--r-- | vs/vc8/.gitattributes (renamed from vc/vc8/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/vc8/.gitignore (renamed from vc/vc8/.gitignore) | 0 | ||||
-rw-r--r-- | vs/vc8/lib/.gitattributes (renamed from vc/vc8/lib/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/vc8/lib/.gitignore (renamed from vc/vc8/lib/.gitignore) | 0 | ||||
-rw-r--r-- | vs/vc8/src/.gitattributes (renamed from vc/vc8/src/.gitattributes) | 0 | ||||
-rw-r--r-- | vs/vc8/src/.gitignore (renamed from vc/vc8/src/.gitignore) | 0 |
30 files changed, 19 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 6c582c772..608bd110a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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; \ \ diff --git a/docs/INSTALL b/docs/INSTALL index 9e3c226a4..737128b36 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -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. diff --git a/vc/.gitignore b/vs/.gitignore index 95f9f5692..95f9f5692 100644 --- a/vc/.gitignore +++ b/vs/.gitignore diff --git a/vc/t/.gitattributes b/vs/t/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/t/.gitattributes +++ b/vs/t/.gitattributes diff --git a/vc/t/.gitignore b/vs/t/.gitignore index e3ebe8050..e3ebe8050 100644 --- a/vc/t/.gitignore +++ b/vs/t/.gitignore diff --git a/vc/t/README b/vs/t/README index 75b04782c..69ebd2701 100644 --- a/vc/t/README +++ b/vs/t/README @@ -1,8 +1,8 @@ Note:
-Files located in subdirectory 'vc/t' and below are 'templates' used for
+Files located in subdirectory 'vs/t' and below are 'templates' used for
the generation of msvc IDE workspace and project files, distributed in
-subdirectories 'vc/vc6' and 'vc/vc8'.
+subdirectories 'vs/vc6' and 'vs/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/vc/t/lib/.gitattributes b/vs/t/lib/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/t/lib/.gitattributes +++ b/vs/t/lib/.gitattributes diff --git a/vc/t/lib/.gitignore b/vs/t/lib/.gitignore index 595d4d850..595d4d850 100644 --- a/vc/t/lib/.gitignore +++ b/vs/t/lib/.gitignore diff --git a/vc/t/lib/vc6_libcurl_dsp.foot b/vs/t/lib/vc6_libcurl_dsp.foot index fd10e8e49..fd10e8e49 100644 --- a/vc/t/lib/vc6_libcurl_dsp.foot +++ b/vs/t/lib/vc6_libcurl_dsp.foot diff --git a/vc/t/lib/vc6_libcurl_dsp.head b/vs/t/lib/vc6_libcurl_dsp.head index 06fb88dee..06fb88dee 100644 --- a/vc/t/lib/vc6_libcurl_dsp.head +++ b/vs/t/lib/vc6_libcurl_dsp.head diff --git a/vc/t/lib/vc8_libcurl_prj.foot b/vs/t/lib/vc8_libcurl_prj.foot index 862ef4227..862ef4227 100644 --- a/vc/t/lib/vc8_libcurl_prj.foot +++ b/vs/t/lib/vc8_libcurl_prj.foot diff --git a/vc/t/lib/vc8_libcurl_prj.head b/vs/t/lib/vc8_libcurl_prj.head index 761468892..761468892 100644 --- a/vc/t/lib/vc8_libcurl_prj.head +++ b/vs/t/lib/vc8_libcurl_prj.head diff --git a/vc/t/src/.gitattributes b/vs/t/src/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/t/src/.gitattributes +++ b/vs/t/src/.gitattributes diff --git a/vc/t/src/.gitignore b/vs/t/src/.gitignore index 595d4d850..595d4d850 100644 --- a/vc/t/src/.gitignore +++ b/vs/t/src/.gitignore diff --git a/vc/vc6/.gitattributes b/vs/vc6/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/vc6/.gitattributes +++ b/vs/vc6/.gitattributes diff --git a/vc/vc6/.gitignore b/vs/vc6/.gitignore index 79f1177e5..79f1177e5 100644 --- a/vc/vc6/.gitignore +++ b/vs/vc6/.gitignore diff --git a/vc/vc6/lib/.gitattributes b/vs/vc6/lib/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/vc6/lib/.gitattributes +++ b/vs/vc6/lib/.gitattributes diff --git a/vc/vc6/lib/.gitignore b/vs/vc6/lib/.gitignore index 7832007ba..7832007ba 100644 --- a/vc/vc6/lib/.gitignore +++ b/vs/vc6/lib/.gitignore diff --git a/vc/vc6/lib/vc6libcurl.dsw b/vs/vc6/lib/vc6libcurl.dsw index 1fa8814a6..1fa8814a6 100644 --- a/vc/vc6/lib/vc6libcurl.dsw +++ b/vs/vc6/lib/vc6libcurl.dsw diff --git a/vc/vc6/src/.gitattributes b/vs/vc6/src/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/vc6/src/.gitattributes +++ b/vs/vc6/src/.gitattributes diff --git a/vc/vc6/src/.gitignore b/vs/vc6/src/.gitignore index 030326912..030326912 100644 --- a/vc/vc6/src/.gitignore +++ b/vs/vc6/src/.gitignore diff --git a/vc/vc6/src/vc6curltool.dsp b/vs/vc6/src/vc6curltool.dsp index 131b71649..131b71649 100644 --- a/vc/vc6/src/vc6curltool.dsp +++ b/vs/vc6/src/vc6curltool.dsp diff --git a/vc/vc6/src/vc6curltool.dsw b/vs/vc6/src/vc6curltool.dsw index b92638a89..b92638a89 100644 --- a/vc/vc6/src/vc6curltool.dsw +++ b/vs/vc6/src/vc6curltool.dsw diff --git a/vc/vc6/vc6curl.dsw b/vs/vc6/vc6curl.dsw index 859edd5e1..859edd5e1 100644 --- a/vc/vc6/vc6curl.dsw +++ b/vs/vc6/vc6curl.dsw diff --git a/vc/vc8/.gitattributes b/vs/vc8/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/vc8/.gitattributes +++ b/vs/vc8/.gitattributes diff --git a/vc/vc8/.gitignore b/vs/vc8/.gitignore index 68e2ba073..68e2ba073 100644 --- a/vc/vc8/.gitignore +++ b/vs/vc8/.gitignore diff --git a/vc/vc8/lib/.gitattributes b/vs/vc8/lib/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/vc8/lib/.gitattributes +++ b/vs/vc8/lib/.gitattributes diff --git a/vc/vc8/lib/.gitignore b/vs/vc8/lib/.gitignore index 4f5c670ba..4f5c670ba 100644 --- a/vc/vc8/lib/.gitignore +++ b/vs/vc8/lib/.gitignore diff --git a/vc/vc8/src/.gitattributes b/vs/vc8/src/.gitattributes index aecf25037..aecf25037 100644 --- a/vc/vc8/src/.gitattributes +++ b/vs/vc8/src/.gitattributes diff --git a/vc/vc8/src/.gitignore b/vs/vc8/src/.gitignore index 7fae07f4e..7fae07f4e 100644 --- a/vc/vc8/src/.gitignore +++ b/vs/vc8/src/.gitignore |