From db258a7b50e89a6b4967724fe6ee3eb37f0b9d44 Mon Sep 17 00:00:00 2001 From: Brian Gladman Date: Sat, 29 Jan 2011 10:50:25 +0000 Subject: [PATCH] 1. Tidy up VS 2010 build 2. Set correct VS tool path on win32 systems svn path=/trunk/yasm/; revision=2368 --- Mkfiles/vc10/genmodule/genmodule.vcxproj | 3 ++ .../vc10/genmodule/genmodule.vcxproj.filters | 3 ++ Mkfiles/vc10/genperf/genperf.vcxproj | 5 ++++ Mkfiles/vc10/genperf/genperf.vcxproj.filters | 15 ++++++++++ Mkfiles/vc10/libyasm/libyasm.vcxproj | 6 ++++ Mkfiles/vc10/libyasm/libyasm.vcxproj.filters | 18 +++++++++++ Mkfiles/vc10/modules/modules.vcxproj | 30 +++++++++++++++++++ Mkfiles/vc10/modules/modules.vcxproj.filters | 30 +++++++++++++++++++ Mkfiles/vc10/re2c/re2c.vcxproj | 1 + Mkfiles/vc10/re2c/re2c.vcxproj.filters | 3 ++ Mkfiles/vc10/readme.vc10.txt | 18 +++++++---- Mkfiles/vc10/vsyasm.props | 2 +- Mkfiles/vc10/vsyasm.vcxproj | 5 ++++ Mkfiles/vc10/yasm.vcxproj | 5 ++++ Mkfiles/vc10/yasm.vcxproj.filters | 15 ++++++++++ Mkfiles/vc10/ytasm.vcxproj | 4 +++ 16 files changed, 157 insertions(+), 6 deletions(-) diff --git a/Mkfiles/vc10/genmodule/genmodule.vcxproj b/Mkfiles/vc10/genmodule/genmodule.vcxproj index 4a48093b..eca6ce85 100644 --- a/Mkfiles/vc10/genmodule/genmodule.vcxproj +++ b/Mkfiles/vc10/genmodule/genmodule.vcxproj @@ -109,6 +109,9 @@ + + + diff --git a/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters b/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters index 85bdf9fe..e9777360 100644 --- a/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters +++ b/Mkfiles/vc10/genmodule/genmodule.vcxproj.filters @@ -14,4 +14,7 @@ + + + \ No newline at end of file diff --git a/Mkfiles/vc10/genperf/genperf.vcxproj b/Mkfiles/vc10/genperf/genperf.vcxproj index b94d5a2b..9d14bf53 100644 --- a/Mkfiles/vc10/genperf/genperf.vcxproj +++ b/Mkfiles/vc10/genperf/genperf.vcxproj @@ -127,8 +127,13 @@ + + + + + diff --git a/Mkfiles/vc10/genperf/genperf.vcxproj.filters b/Mkfiles/vc10/genperf/genperf.vcxproj.filters index 40029ebc..f45157d9 100644 --- a/Mkfiles/vc10/genperf/genperf.vcxproj.filters +++ b/Mkfiles/vc10/genperf/genperf.vcxproj.filters @@ -34,6 +34,21 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/Mkfiles/vc10/libyasm/libyasm.vcxproj b/Mkfiles/vc10/libyasm/libyasm.vcxproj index af67e44d..1498e312 100644 --- a/Mkfiles/vc10/libyasm/libyasm.vcxproj +++ b/Mkfiles/vc10/libyasm/libyasm.vcxproj @@ -226,6 +226,7 @@ + @@ -242,7 +243,9 @@ + + @@ -251,6 +254,9 @@ + + + diff --git a/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters b/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters index 6385583d..d1ee2793 100644 --- a/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters +++ b/Mkfiles/vc10/libyasm/libyasm.vcxproj.filters @@ -175,6 +175,24 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/Mkfiles/vc10/modules/modules.vcxproj b/Mkfiles/vc10/modules/modules.vcxproj index 5fc78cfa..9e1f917d 100644 --- a/Mkfiles/vc10/modules/modules.vcxproj +++ b/Mkfiles/vc10/modules/modules.vcxproj @@ -250,6 +250,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -258,12 +284,16 @@ + + + + diff --git a/Mkfiles/vc10/modules/modules.vcxproj.filters b/Mkfiles/vc10/modules/modules.vcxproj.filters index 1d0ad244..d66bf489 100644 --- a/Mkfiles/vc10/modules/modules.vcxproj.filters +++ b/Mkfiles/vc10/modules/modules.vcxproj.filters @@ -219,5 +219,35 @@ Source Files\preprocs\nasm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc10/re2c/re2c.vcxproj b/Mkfiles/vc10/re2c/re2c.vcxproj index 88bb5dea..fb50f146 100644 --- a/Mkfiles/vc10/re2c/re2c.vcxproj +++ b/Mkfiles/vc10/re2c/re2c.vcxproj @@ -117,6 +117,7 @@ + diff --git a/Mkfiles/vc10/re2c/re2c.vcxproj.filters b/Mkfiles/vc10/re2c/re2c.vcxproj.filters index 9416e71d..426ee6eb 100644 --- a/Mkfiles/vc10/re2c/re2c.vcxproj.filters +++ b/Mkfiles/vc10/re2c/re2c.vcxproj.filters @@ -70,6 +70,9 @@ Header Files + + Header Files + diff --git a/Mkfiles/vc10/readme.vc10.txt b/Mkfiles/vc10/readme.vc10.txt index a390d661..0182520b 100644 --- a/Mkfiles/vc10/readme.vc10.txt +++ b/Mkfiles/vc10/readme.vc10.txt @@ -2,7 +2,7 @@ Building YASM with Microsoft Visual Studio 2010 (C/C++ v10) ----------------------------------------------------------- This note describes how to build YASM using Microsoft Visual -Studio 2010 (C/C++ v10 - currently releasxed as beta 2). +Studio 2010 (C/C++ v10). 1. The Compiler --------------- @@ -36,18 +36,22 @@ 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 +with Visual Studio 2010. To tell Visual Studio where to find vsyasm.exe, the environment variable YASMPATH can be set to the absolute path of the directory in which vsyasm.exe is located (this path should include the final backslash). 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: +of the vsyasm.exe binary in these directories. The typical +location on 64-bit Windows is: C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin +On 32-bit Windows it is normally at: + +C:\Program Files\Microsoft Visual Studio 10.0\VC\bin + Depending on your system you can use either the win32 or the x64 version of vsyasm.exe, which must be named vsyasm.exe. @@ -61,6 +65,10 @@ ways to do this: which is typically at: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\BuildCustomizations + + or: + + C:\Program Files\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 @@ -108,4 +116,4 @@ I am most grateful for the fantastic support that Peter Johnson, YASM's creator, has given me in tracking down issues in using YASM for the production of Windows x64 code. - Brian Gladman, 10th June 2010 + Brian Gladman, 29th January 2011 diff --git a/Mkfiles/vc10/vsyasm.props b/Mkfiles/vc10/vsyasm.props index 66308c4c..89476f2e 100644 --- a/Mkfiles/vc10/vsyasm.props +++ b/Mkfiles/vc10/vsyasm.props @@ -10,7 +10,7 @@ Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn) - C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\ + $(VCInstallDir)bin\ diff --git a/Mkfiles/vc10/vsyasm.vcxproj b/Mkfiles/vc10/vsyasm.vcxproj index 0c6e22a2..a5ed2604 100644 --- a/Mkfiles/vc10/vsyasm.vcxproj +++ b/Mkfiles/vc10/vsyasm.vcxproj @@ -263,6 +263,11 @@ + + + + + diff --git a/Mkfiles/vc10/yasm.vcxproj b/Mkfiles/vc10/yasm.vcxproj index bf663e78..9379d70a 100644 --- a/Mkfiles/vc10/yasm.vcxproj +++ b/Mkfiles/vc10/yasm.vcxproj @@ -253,6 +253,11 @@ + + + + + diff --git a/Mkfiles/vc10/yasm.vcxproj.filters b/Mkfiles/vc10/yasm.vcxproj.filters index 9f3aa728..df5419b8 100644 --- a/Mkfiles/vc10/yasm.vcxproj.filters +++ b/Mkfiles/vc10/yasm.vcxproj.filters @@ -22,5 +22,20 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file diff --git a/Mkfiles/vc10/ytasm.vcxproj b/Mkfiles/vc10/ytasm.vcxproj index 1599a15b..d45cdf48 100644 --- a/Mkfiles/vc10/ytasm.vcxproj +++ b/Mkfiles/vc10/ytasm.vcxproj @@ -253,6 +253,10 @@ + + + + -- 2.40.0