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

diff --git a/Mkfiles/vc10/genversion/genversion.vcxproj b/Mkfiles/vc10/genversion/genversion.vcxproj
index 60e2679f307342b022e69c3c4b8c015a9f444c9d..cce7c7fd15181fc9a3ce2d59777f7305f93d9261 100644 (file)
--- a/Mkfiles/vc10/genversion/genversion.vcxproj
+++ b/Mkfiles/vc10/genversion/genversion.vcxproj
@@ -48,7 +48,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\vc9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\vc10;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -77,7 +77,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <Optimization>Full</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\vc9;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\vc10;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <PrecompiledHeader>\r

diff --git a/Mkfiles/vc10/readme.vc10.txt b/Mkfiles/vc10/readme.vc10.txt
index 497495d3ff73358b05e644405beda558f846c576..81c79dd021d5ac87f98b283921d15a51a9908c0e 100644 (file)
--- a/Mkfiles/vc10/readme.vc10.txt
+++ b/Mkfiles/vc10/readme.vc10.txt
@@ -35,39 +35,48 @@ as appropriate to build the YASM binaries that you need.
 4. Using YASM with Visual Sudio 2010 and VC++ version 10\r
 --------------------------------------------------------\r
 \r
-1. Firstly you need to locate the directory (or directories) \r
+The YASM version vsyasm.exe is designed specifically for use\r
+with Visual Studio 2010.  To tell Visual Studio where to find\r
+vsyasm.exe, the environment variable YASMPATH can be set to \r
+the absolute path to the directory in which vsyasm.exe is\r
+located (this path should include the final backslash). \r
+\r
+Alternatively you can locate the directory (or directories) \r
 where the VC++ compiler binaries are located and put copies \r
-of the appropriate yasm.exe binary in these directories. A\r
-typical location is:\r
+of the vsyasm.exe binary in these directories. A typical \r
+location is:\r
 \r
 C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\r
 \r
 Depending on your system you can use either the win32 or the\r
-x64 version of YASM.  It must be named yasm.exe.\r
+x64 version of vsyasm.exe.   It must be named vsyasm.exe. \r
 \r
-2. To use the new custom tools facility in Visual Studio 2010,\r
-you need to place a copy of three files - yasm.props, yasm.targets \r
-and yasm.xml - into the MSBUILD customisation directory, which is\r
-typically at:\r
+To use the new custom tools facility in Visual Studio 2010, you\r
+need to place a copy of three files - yasm.props, yasm.targets \r
+and yasm.xml - into the MSBUILD customisation directory, which\r
+is typically at:\r
 \r
 C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations\r
 \r
 This allows you to configure YASM as an assembler within the VC++\r
-IDE. To use YASM in a project, right click on the project in the\r
+IDE. Alternatively, these three files can be placed anywhere and\r
+the build customisation process described later can be used to set \r
+their location.  \r
+\r
+To use YASM in a project, right click on the project in the\r
 Solution Explorer and select 'Build Customisations..'. This will \r
 give you a dialog box that allows you to select YASM as an \r
 assembler (note that your assembler files need to have the \r
-extension '.asm').\r
+extension '.asm').  If you have put the three vsyasm files \r
+described above in a custom location, you will need to let the\r
+dialogue find them using the 'Find Existing' button below the \r
+dialogue.\r
 \r
 To assemble a file with YASM, select the Property Page for the \r
 file and the select 'Yasm Assembler' in the Tool dialog entry. \r
 Then click 'Apply' and an additional property page entry will \r
 appear and enable YASM settings to be established.\r
 \r
-As alternative to placing the yasm.rules files as described \r
-above is to set the rules file path in the Visual Studio 2010\r
-settings dialogue.\r
-\r
 5. A Linker Issue\r
 -----------------\r
 \r
@@ -94,5 +103,4 @@ I am most grateful for the fantastic support that Peter Johnson,
 YASM's creator, has given me in tracking down issues in using\r
 YASM for the production of Windows x64 code.\r
 \r
-  Brian Gladman, 10th November 2009\r
-\r
+  Brian Gladman, 10th June 2010\r

diff --git a/Mkfiles/vc10/yasm.sln b/Mkfiles/vc10/yasm.sln
index ba2485710000564bd9b5b3326aecbc922db2d369..76f5df737121117ae820e6e2832aca43614e4516 100644 (file)
--- a/Mkfiles/vc10/yasm.sln
+++ b/Mkfiles/vc10/yasm.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{825AC694-358C-4D8D-92DE-33A2691978CE}"\r
        ProjectSection(SolutionItems) = preProject\r
                crt_secure_no_deprecate.vsprops = crt_secure_no_deprecate.vsprops\r
-               readme.vc8.txt = readme.vc8.txt\r
+               readme.vc10.txt = readme.vc10.txt\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyasm", "libyasm\libyasm.vcxproj", "{29FE7874-1256-4AD6-B889-68E399DC9608}"\r