aboutsummaryrefslogtreecommitdiff
path: root/building.txt
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-30 12:36:28 +0000
committermarha <marha@users.sourceforge.net>2010-03-30 12:36:28 +0000
commitff48c0d9098080b51ea12710029135916d117806 (patch)
tree96e6af9caf170ba21a1027b24e306a07e27d7b75 /building.txt
parentbb731f5ac92655c4860a41fa818a7a63005f8369 (diff)
downloadvcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz
vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2
vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip
svn merge -r514:HEAD ^/branches/released .
Diffstat (limited to 'building.txt')
-rw-r--r--building.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/building.txt b/building.txt
index b5a979b3c..5c84fb92e 100644
--- a/building.txt
+++ b/building.txt
@@ -3,6 +3,7 @@ Prerequisits:
- Perl (cygwin perl (http://www.cygwin.com/), strawberry perl (http://strawberryperl.com) or activestate perl (http://www.activestate.com/activeperl/) )
- Python (2.5 used: http://www.python.org/)
- Gnuwin32 gawk, gzip, flex, bison (and it's dependancies), sed (and it's dependancies (http://gnuwin32.sourceforge.net/)
+- nasm (http://nasm.sourceforge.net). Make sure the nasm directory is in your path
- Make sure that the gnuwin32 binaries are in a directory path with no spaces, like 'C:\gnuwin32\bin'
- Make sure the environment PATH includes the directory where the gnuwin32 binaries are
- Make sure python, perl are in the environment PATH
@@ -18,7 +19,7 @@ Building freetype:
Building openssl:
- run 'perl Configure VC-WIN32' in the openssl directory
-- run 'ms\do_masm.bat' in the openssl' directory
+- run 'ms\do_nasm.bat' in the openssl' directory
- run 'nmake -f ms\nt.mak' in the openssl directory
- run 'nmake DEBUG=1 -f ms\nt.mak' in the openssl directory (if you want to build the DEBUG version of vcxsrv)