Minor update to the Visual Studio 2010 build files

svn path=/trunk/yasm/; revision=2332

2 files changed, 32 insertions, 21 deletions

diff --git a/Mkfiles/vc10/readme.vc10.txt b/Mkfiles/vc10/readme.vc10.txt
index 81c79dd0..a390d661 100644
--- a/Mkfiles/vc10/readme.vc10.txt
+++ b/Mkfiles/vc10/readme.vc10.txt
@@ -38,10 +38,10 @@ as appropriate to build the YASM binaries that you need.
 The YASM version vsyasm.exe is designed specifically for use

 with Visual Studio 2010.  To tell Visual Studio where to find

 vsyasm.exe, the environment variable YASMPATH can be set to 

-the absolute path to the directory in which vsyasm.exe is

+the absolute path of the directory in which vsyasm.exe is

 located (this path should include the final backslash). 

 

-Alternatively you can locate the directory (or directories) 

+Alternatively you can find the directory (or directories) 

 where the VC++ compiler binaries are located and put copies 

 of the vsyasm.exe binary in these directories. A typical 

 location is:

@@ -49,28 +49,33 @@ location is:
 C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin

 

 Depending on your system you can use either the win32 or the

-x64 version of vsyasm.exe.   It must be named vsyasm.exe. 

+x64 version of vsyasm.exe, which must be named vsyasm.exe. 

 

 To use the new custom tools facility in Visual Studio 2010, you

 need to place a copy of three files - yasm.props, yasm.targets 

-and yasm.xml - into the MSBUILD customisation directory, which

-is typically at:

-

-C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations

-

-This allows you to configure YASM as an assembler within the VC++

-IDE. Alternatively, these three files can be placed anywhere and

-the build customisation process described later can be used to set 

-their location.  

-

-To use YASM in a project, right click on the project in the

-Solution Explorer and select 'Build Customisations..'. This will 

-give you a dialog box that allows you to select YASM as an 

-assembler (note that your assembler files need to have the 

-extension '.asm').  If you have put the three vsyasm files 

-described above in a custom location, you will need to let the

-dialogue find them using the 'Find Existing' button below the 

-dialogue.

+and yasm.xml - into a location where they can be found by the

+Visual Studio build customisation processes.  There are several 

+ways to do this:

+

+  a. put these files in the MSBUILD customisation directory, 

+  which is typically at:

+

+    C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations

+

+  b. put them in a convenient location and set this path in the 

+     'Build Customisations Search Path' in the Visual Studio 

+	 'Projects and Solutions|VC++ Project Settings' item in

+	 the 'Tools|Options' menu; 

+

+  c. put them in a convenient location and set this path in the 

+     'Build Customisation dialogue (discussed later).

+

+To use YASM in a project, right click on the project in the Solution 

+Explorer and select 'Build Customisations..'. This will give you a 

+dialog box that allows you to select YASM as an assembler (note that 

+your assembler files need to have the extension '.asm').  If you have 

+used option c. above, you will need to let the dialogue find them 

+using the 'Find Existing' button below the dialogue.

 

 To assemble a file with YASM, select the Property Page for the 

 file and the select 'Yasm Assembler' in the Tool dialog entry. 

diff --git a/Mkfiles/vc10/yasm.sln b/Mkfiles/vc10/yasm.sln
index 76f5df73..342bf07b 100644
--- a/Mkfiles/vc10/yasm.sln
+++ b/Mkfiles/vc10/yasm.sln
@@ -25,8 +25,14 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genstring", "genstring\genstring.vcxproj", "{021CEB0A-F721-4F59-B349-9CEEAF244459}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ytasm", "ytasm.vcxproj", "{2162937B-0DBD-4450-B45F-DF578D8E7508}"

+	ProjectSection(ProjectDependencies) = postProject

+		{021CEB0A-F721-4F59-B349-9CEEAF244459} = {021CEB0A-F721-4F59-B349-9CEEAF244459}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsyasm", "vsyasm.vcxproj", "{7FDD85BB-CC86-442B-A425-989B5B296ED5}"

+	ProjectSection(ProjectDependencies) = postProject

+		{021CEB0A-F721-4F59-B349-9CEEAF244459} = {021CEB0A-F721-4F59-B349-9CEEAF244459}

+	EndProjectSection

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution