From 090430d67b3a7fb0aacc249b82428b7ea1424d70 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 30 Apr 2010 13:46:01 +0000
Subject: Now default building is VS2010. VS2008 is still working.

---
 building.txt   |  6 ++++--
 makefile.after | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/building.txt b/building.txt
index 5c84fb92e..6ccfcf795 100644
--- a/building.txt
+++ b/building.txt
@@ -1,5 +1,5 @@
 Prerequisits:
-- Microsoft Visual C++ 2008 Express Edition with SP1 (http://www.microsoft.com/express/vc/)
+- Microsoft Visual C++ 2008 Express Edition with SP1 (http://www.microsoft.com/express/vc/) or Visual C++ 2010
 - 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/)
@@ -8,13 +8,14 @@ Prerequisits:
 - Make sure the environment PATH includes the directory where the gnuwin32 binaries are
 - Make sure python, perl are in the environment PATH
 - make sure the command prompt is set for compiling with the visual studio compiler (vcvars32.bat)
+- When using Visual C++ 2008 define the environment variable VS2008=1
 
 When you want to use the tools/cleantree.py script, also install svn command line client:
 - Download/install a command line version of svn. http://www.sliksvn.com/en/download (other versions are fine too).
 - Make sure that the directory where the svn.exe file is, is added to the System PATH
 
 Building freetype:
-- open freetype\freetype.sln in Visual C++ 2008 Express Edition
+- open freetype\freetype.sln in Visual C++ 2008 Express Edition or freetype\freetypevc10.sln in Visual C++ 2010
   Build configurations 'Release Multithreaded' and 'Debug Multithreaded'
 
 Building openssl:
@@ -46,4 +47,5 @@ To build installer:
 - run 'packageall.bat' in xorg-server\installer
 
 To clean the project tree (uses svn) go to the top directory at a command prompt and type in 'python tools\cleantree.py -r'
+Do this only on a source tree checked out with svn (svn co https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/trunk).
 
diff --git a/makefile.after b/makefile.after
index 32cfc2a56..1fe4e08bd 100644
--- a/makefile.after
+++ b/makefile.after
@@ -38,16 +38,24 @@ endif
 
 PDB := $(EXE:%.exe=%.pdb)
 
-MANIFESTFILE:=$(OBJDIR)\runtime.manifest
+ifdef VS2008
 
-all: $(EXE)
+MANIFESTFILE:=$(OBJDIR)\runtime.manifest
 
 $(MANIFESTFILE):
 	$(MHMAKECONF)/tools/genruntimemanifest $@ $(DEBUG)
 
+endif
+
+all: $(EXE)
+
 $(EXE) :  $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE) $(EXTRALIB)
+ifndef VS2008
+	$(LINK) $(LINKFLAGS) /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
+else
 	$(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
 	mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1
+endif
 
 endif  # End WINAPP or TTYAPP stuff
 
-- 
cgit v1.2.3