Layout the 'either/or' with more white space to clarify
which alternatives are matched up.
Reference the build script which automates one sequence of options.
Signed-off-by: Philip Oakley <philipoakley@xxxxxxx>
---
compat/vcbuild/README | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index df8a657..f4f6723 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -3,20 +3,24 @@ The Steps of Build Git with VS2008
1. You need the build environment, which contains the Git dependencies
to be able to compile, link and run Git with MSVC.
- You can either use the binary repository:
+ You can either:
+ use the binary repository:
WWW: http://repo.or.cz/w/msvcgit.git
Git: git clone git://repo.or.cz/msvcgit.git
Zip: http://repo.or.cz/w/msvcgit.git?a=snapshot;h=master;sf=zip
- and call the setup_32bit_env.cmd batch script before compiling Git,
- (see repo/package README for details), or the source repository:
+ and call the setup_32bit_env.cmd batch script before compiling Git,
+ (see repo/package README for details),
+
+ or:
+ use the source repository:
WWW: http://repo.or.cz/w/gitbuild.git
Git: git clone git://repo.or.cz/gitbuild.git
Zip: (None, as it's a project with submodules)
- and build the support libs as instructed in that repo/package.
+ and build the support libs as instructed in that repo/package.
2. Ensure you have the msysgit environment in your path, so you have
GNU Make, bash and perl available.
@@ -33,18 +37,27 @@ The Steps of Build Git with VS2008
make common-cmds.h
to generate the common-cmds.h file needed to compile git.
-4. Then either build Git with the GNU Make Makefile in the Git projects
- root
+4. Then either
+
+ build Git with the GNU Make Makefile in the Git projects root
make MSVC=1
- or generate Visual Studio solution/projects (.sln/.vcproj) with the
+ or
+
+ generate Visual Studio solution/projects (.sln/.vcproj) with the
command
perl contrib/buildsystems/generate -g Vcproj
and open and build the solution with the IDE
devenv git.sln /useenv
- or build with the IDE build engine directly from the command line
+ or
+
+ build with the IDE build engine directly from the command line
devenv git.sln /useenv /build "Release|Win32"
The /useenv option is required, so Visual Studio picks up the
environment variables for the support libraries required to build
Git, which you set up in step 1.
Done!
+
+Or, use the msvc-build script; also in /msysgit/bin/msvc-build
+
+For those with VS2010: You may need to associate the generated .sln file with VS2010 rather than the MS version selector program.
--
1.9.4.msysgit.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html